#5623: UI tweaks

codereader · May 31, 2021 · 44e6df4 · 44e6df4
1 parent 904227c
commit 44e6df4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/install/ui/mergecontroldialog.fbp b/install/ui/mergecontroldialog.fbp
@@ -43,7 +43,7 @@
             <property name="minimum_size">300,-1</property>
             <property name="name">MergeControlDialogMainPanel</property>
             <property name="pos"></property>
-            <property name="size">391,372</property>
+            <property name="size">391,187</property>
             <property name="subclass"></property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
@@ -274,7 +274,7 @@
                                             </object>
                                             <object class="sizeritem" expanded="0">
                                                 <property name="border">0</property>
-                                                <property name="flag">wxEXPAND</property>
+                                                <property name="flag">wxEXPAND|wxRIGHT</property>
                                                 <property name="proportion">1</property>
                                                 <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
@@ -337,8 +337,8 @@
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="1">
-                                                <property name="border">0</property>
-                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="border">3</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxStaticBitmap" expanded="1">
                                                     <property name="BottomDockable">1</property>
@@ -719,7 +719,7 @@
                                 <property name="orient">wxHORIZONTAL</property>
                                 <property name="permission">none</property>
                                 <object class="sizeritem" expanded="1">
-                                    <property name="border">6</property>
+                                    <property name="border">0</property>
                                     <property name="flag">wxRIGHT</property>
                                     <property name="proportion">1</property>
                                     <object class="wxButton" expanded="1">
@@ -791,8 +791,8 @@
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="1">
-                                    <property name="border">0</property>
-                                    <property name="flag">wxALL</property>
+                                    <property name="border">6</property>
+                                    <property name="flag">wxLEFT</property>
                                     <property name="proportion">1</property>
                                     <object class="wxButton" expanded="1">
                                         <property name="BottomDockable">1</property>

diff --git a/install/ui/mergecontroldialog.xrc b/install/ui/mergecontroldialog.xrc
@@ -2,7 +2,7 @@
 <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
 	<object class="wxPanel" name="MergeControlDialogMainPanel">
 		<style>wxTAB_TRAVERSAL</style>
-		<size>391,372</size>
+		<size>391,187</size>
 		<object class="wxBoxSizer">
 			<orient>wxVERTICAL</orient>
 			<object class="sizeritem">
@@ -59,7 +59,7 @@
 										</object>
 										<object class="sizeritem">
 											<option>1</option>
-											<flag>wxEXPAND</flag>
+											<flag>wxEXPAND|wxRIGHT</flag>
 											<border>0</border>
 											<object class="wxTextCtrl" name="MergeMapFilename">
 												<tooltip>The map file to merge into the target map</tooltip>
@@ -68,8 +68,8 @@
 										</object>
 										<object class="sizeritem">
 											<option>0</option>
-											<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-											<border>0</border>
+											<flag>wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</flag>
+											<border>3</border>
 											<object class="wxStaticBitmap" name="m_bitmap2">
 												<bitmap stock_id="darkradiant:merge_arrow.png" stock_client="">undefined.png</bitmap>
 											</object>
@@ -136,7 +136,7 @@
 							<object class="sizeritem">
 								<option>1</option>
 								<flag>wxRIGHT</flag>
-								<border>6</border>
+								<border>0</border>
 								<object class="wxButton" name="LoadAndCompareButton">
 									<label>Load and Compare</label>
 									<default>0</default>
@@ -146,8 +146,8 @@
 							</object>
 							<object class="sizeritem">
 								<option>1</option>
-								<flag>wxALL</flag>
-								<border>0</border>
+								<flag>wxLEFT</flag>
+								<border>6</border>
 								<object class="wxButton" name="AbortMergeButton">
 									<label>Abort Merge</label>
 									<default>0</default>

diff --git a/radiant/ui/merge/MergeControlDialog.cpp b/radiant/ui/merge/MergeControlDialog.cpp
@@ -57,8 +57,11 @@ MergeControlDialog::MergeControlDialog() :
     updateControlSensitivity();
     Bind(wxEVT_IDLE, &MergeControlDialog::onIdle, this);
 
-    SetMinSize(wxSize(300, 400));
-    InitialiseWindowPosition(300, 400, RKEY_WINDOW_STATE);
+    Layout();
+    Fit();
+
+    SetMinSize(wxSize(300, 210));
+    InitialiseWindowPosition(300, 210, RKEY_WINDOW_STATE);
 }
 
 std::shared_ptr<MergeControlDialog>& MergeControlDialog::InstancePtr()