#6131: Move default floating size info from user.xml to the default s…

…ettings
codereader · Oct 23, 2022 · 7cbd902 · 7cbd902
1 parent d89814f
commit 7cbd902
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/install/user.xml b/install/user.xml
@@ -39,7 +39,6 @@
       <showStimTypeIDs value="0" />
     </stimResponseEditor>
     <lightInspector>
-      <window xPosition="100" yPosition="150" width="780" height="400" />
       <instantApply value="1" />
     </lightInspector>
     <ModelSelector>
@@ -80,14 +79,6 @@
       <scaleYStep value="1.1" />
       <scaleZStep value="1.1" />
     </transformPanel>
-    <layers>
-      <controlDialog>
-        <window xPosition="57" yPosition="449" width="164" height="299" />
-      </controlDialog>
-    </layers>
-    <mergeControlDialog>
-        <window xPosition="158" yPosition="241" width="400" height="380"/>
-    </mergeControlDialog>
     <textures>
       <materialChooser>
         <window xPosition="200" yPosition="100" width="550" height="500" />
@@ -141,9 +132,6 @@
         <pane name="vertical2" position="250" />
       </splitPane>
     </mainFrame>
-    <entityList>
-      <window xPosition="50" yPosition="530" width="250" height="400" />
-    </entityList>
     <multiMonitor>
       <startMonitorNum value="0" />
     </multiMonitor>

diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
@@ -266,12 +266,12 @@ void UserInterfaceModule::initialiseModule(const IApplicationContext& ctx)
     {
         // Set default locations of some controls
         GlobalMainFrame().addControl(UserControl::SurfaceInspector, { IMainFrame::Location::FloatingWindow, false });
-        GlobalMainFrame().addControl(UserControl::LayerControlPanel, { IMainFrame::Location::FloatingWindow, false });
+        GlobalMainFrame().addControl(UserControl::LayerControlPanel, { IMainFrame::Location::FloatingWindow, false, 180, 300 });
         GlobalMainFrame().addControl(UserControl::TextureTool, { IMainFrame::Location::FloatingWindow, false });
         GlobalMainFrame().addControl(UserControl::PatchInspector, { IMainFrame::Location::FloatingWindow, false });
-        GlobalMainFrame().addControl(UserControl::LightInspector, { IMainFrame::Location::FloatingWindow, false });
+        GlobalMainFrame().addControl(UserControl::LightInspector, { IMainFrame::Location::FloatingWindow, false, 780, 420 });
         GlobalMainFrame().addControl(UserControl::TransformPanel, { IMainFrame::Location::FloatingWindow, false });
-        GlobalMainFrame().addControl(UserControl::MapMergePanel, { IMainFrame::Location::FloatingWindow, false });
+        GlobalMainFrame().addControl(UserControl::MapMergePanel, { IMainFrame::Location::FloatingWindow, false, 380, 440 });
         GlobalMainFrame().addControl(UserControl::EntityList, { IMainFrame::Location::FloatingWindow, false, 250, 400 });
         GlobalMainFrame().addControl(UserControl::AasVisualisationPanel, { IMainFrame::Location::FloatingWindow, false });
         GlobalMainFrame().addControl(UserControl::FindAndReplaceMaterial, { IMainFrame::Location::FloatingWindow, false });