#5623: Control dialog size and position on initial startup

codereader · May 31, 2021 · 539f7f5 · 539f7f5
1 parent 44e6df4
commit 539f7f5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/install/ui/mergecontroldialog.fbp b/install/ui/mergecontroldialog.fbp
@@ -751,7 +751,7 @@
                                         <property name="fg"></property>
                                         <property name="floatable">1</property>
                                         <property name="focus"></property>
-                                        <property name="font"></property>
+                                        <property name="font">,90,92,-1,70,0</property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>

diff --git a/install/ui/mergecontroldialog.xrc b/install/ui/mergecontroldialog.xrc
@@ -138,6 +138,11 @@
 								<flag>wxRIGHT</flag>
 								<border>0</border>
 								<object class="wxButton" name="LoadAndCompareButton">
+									<font>
+										<style>normal</style>
+										<weight>bold</weight>
+										<underlined>0</underlined>
+									</font>
 									<label>Load and Compare</label>
 									<default>0</default>
 									<markup>0</markup>

diff --git a/install/user.xml b/install/user.xml
@@ -80,6 +80,9 @@
         <window xPosition="57" yPosition="449" width="164" height="299" />
       </controlDialog>
     </layers>
+    <mergeControlDialog>
+        <window xPosition="158" yPosition="241" width="400" height="210"/>
+    </mergeControlDialog>
     <textures>
       <shaderChooser>
         <window xPosition="200" yPosition="100" width="550" height="500" />

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