From c0de98f9f28235ed4770128090420c8d329b9613 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 29 Aug 2020 15:07:12 -0700
Subject: [PATCH] [sim] Fix GUI scaling of window sizes (#2668)

Also tweak initial sizes, positions, and visibility.
---
 simulation/halsim_gui/src/main/native/cpp/EncoderGui.cpp      | 2 +-
 simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp       | 2 ++
 simulation/halsim_gui/src/main/native/cpp/Mechanism2D.cpp     | 1 +
 .../halsim_gui/src/main/native/cpp/NetworkTablesGui.cpp       | 4 ++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/simulation/halsim_gui/src/main/native/cpp/EncoderGui.cpp b/simulation/halsim_gui/src/main/native/cpp/EncoderGui.cpp
index 8edf1d95fd..bbf3f2408d 100644
--- a/simulation/halsim_gui/src/main/native/cpp/EncoderGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/EncoderGui.cpp
@@ -117,5 +117,5 @@ void EncoderGui::Initialize() {
   gEncoders.Initialize();
   HALSimGui::AddWindow("Encoders", DisplayEncoders,
                        ImGuiWindowFlags_AlwaysAutoResize);
-  HALSimGui::SetDefaultWindowPos("Encoders", 640, 215);
+  HALSimGui::SetDefaultWindowPos("Encoders", 5, 250);
 }
diff --git a/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
index 3cead74e8d..4d769cc199 100644
--- a/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
@@ -210,6 +210,8 @@ bool HALSimGui::Initialize() {
       if ((window.posCond & ImGuiCond_FirstUseEver) != 0) {
         window.pos.x *= windowScale;
         window.pos.y *= windowScale;
+        window.size.x *= windowScale;
+        window.size.y *= windowScale;
       }
     }
   });
diff --git a/simulation/halsim_gui/src/main/native/cpp/Mechanism2D.cpp b/simulation/halsim_gui/src/main/native/cpp/Mechanism2D.cpp
index 3a30642247..8203325a0d 100644
--- a/simulation/halsim_gui/src/main/native/cpp/Mechanism2D.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/Mechanism2D.cpp
@@ -314,6 +314,7 @@ void Mechanism2D::Initialize() {
 
   buildColorTable();
   HALSimGui::AddWindow("Mechanism 2D", DisplayAssembly2D);
+  HALSimGui::SetWindowVisibility("Mechanism 2D", HALSimGui::kHide);
   HALSimGui::AddOptionMenu(OptionMenuLocateJson);
   HALSimGui::SetDefaultWindowPos("Mechanism 2D", 200, 200);
   HALSimGui::SetDefaultWindowSize("Mechanism 2D", 600, 600);
diff --git a/simulation/halsim_gui/src/main/native/cpp/NetworkTablesGui.cpp b/simulation/halsim_gui/src/main/native/cpp/NetworkTablesGui.cpp
index 548b49a31c..7e6526cd41 100644
--- a/simulation/halsim_gui/src/main/native/cpp/NetworkTablesGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/NetworkTablesGui.cpp
@@ -357,6 +357,6 @@ static void DisplayNetworkTables() {
 
 void NetworkTablesGui::Initialize() {
   HALSimGui::AddWindow("NetworkTables", DisplayNetworkTables);
-  HALSimGui::SetDefaultWindowPos("NetworkTables", 250, 260);
-  HALSimGui::SetDefaultWindowSize("NetworkTables", 1500, 375);
+  HALSimGui::SetDefaultWindowPos("NetworkTables", 250, 277);
+  HALSimGui::SetDefaultWindowSize("NetworkTables", 750, 185);
 }