Finish up DPI scaling fixes (for Windows at least)

- Moved UI.h/cpp to the UI dir instead of General - Replaced/updated usage of ui::pad etc to either use LayoutHelper or pass in a window to use for DPI scaling - Fixed some other minor scaling related issues
sirjuddington · Jun 1, 2024 · 82c36f8 · 82c36f8
1 parent ca8d822
commit 82c36f8
Show file tree

Hide file tree

Showing 84 changed files with 286 additions and 253 deletions.
diff --git a/src/Application/App.cpp b/src/Application/App.cpp
@@ -46,7 +46,7 @@
 #include "General/Misc.h"
 #include "General/ResourceManager.h"
 #include "General/SAction.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Graphics/Icons.h"
 #include "Graphics/Palette/PaletteManager.h"
 #include "Graphics/SImage/SIFormat.h"

diff --git a/src/Archive/Archive.cpp b/src/Archive/Archive.cpp
@@ -35,7 +35,7 @@
 #include "ArchiveEntry.h"
 #include "ArchiveFormatHandler.h"
 #include "EntryType/EntryType.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "MapDesc.h"
 #include "Utility/FileUtils.h"
 #include "Utility/StringUtils.h"

diff --git a/src/Archive/ArchiveManager.cpp b/src/Archive/ArchiveManager.cpp
@@ -40,7 +40,7 @@
 #include "EntryType/EntryType.h"
 #include "General/Console.h"
 #include "General/ResourceManager.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/FileUtils.h"
 #include "Utility/StringUtils.h"
 

diff --git a/src/Archive/Formats/ADatArchiveHandler.cpp b/src/Archive/Formats/ADatArchiveHandler.cpp
@@ -34,7 +34,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/Compression.h"
 #include "Utility/StringUtils.h"
 

diff --git a/src/Archive/Formats/BSPArchiveHandler.cpp b/src/Archive/Formats/BSPArchiveHandler.cpp
@@ -42,7 +42,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 
 using namespace slade;
 

diff --git a/src/Archive/Formats/ChasmBinArchiveHandler.cpp b/src/Archive/Formats/ChasmBinArchiveHandler.cpp
@@ -35,7 +35,7 @@
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
 #include "Archive/EntryType/EntryType.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;

diff --git a/src/Archive/Formats/DatArchiveHandler.cpp b/src/Archive/Formats/DatArchiveHandler.cpp
@@ -34,7 +34,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;

diff --git a/src/Archive/Formats/DirArchiveHandler.cpp b/src/Archive/Formats/DirArchiveHandler.cpp
@@ -39,7 +39,7 @@
 #include "Archive/ArchiveEntry.h"
 #include "Archive/EntryType/EntryType.h"
 #include "Archive/MapDesc.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/FileUtils.h"
 #include "Utility/StringUtils.h"
 

diff --git a/src/Archive/Formats/DiskArchiveHandler.cpp b/src/Archive/Formats/DiskArchiveHandler.cpp
@@ -37,7 +37,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;

diff --git a/src/Archive/Formats/GobArchiveHandler.cpp b/src/Archive/Formats/GobArchiveHandler.cpp
@@ -34,7 +34,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 
 using namespace slade;
 

diff --git a/src/Archive/Formats/GrpArchiveHandler.cpp b/src/Archive/Formats/GrpArchiveHandler.cpp
@@ -34,7 +34,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 
 using namespace slade;
 

diff --git a/src/Archive/Formats/HogArchiveHandler.cpp b/src/Archive/Formats/HogArchiveHandler.cpp
@@ -34,7 +34,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;

diff --git a/src/Archive/Formats/LfdArchiveHandler.cpp b/src/Archive/Formats/LfdArchiveHandler.cpp
@@ -34,7 +34,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;

diff --git a/src/Archive/Formats/LibArchiveHandler.cpp b/src/Archive/Formats/LibArchiveHandler.cpp
@@ -34,7 +34,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 
 using namespace slade;
 

diff --git a/src/Archive/Formats/PakArchiveHandler.cpp b/src/Archive/Formats/PakArchiveHandler.cpp
@@ -34,7 +34,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;

diff --git a/src/Archive/Formats/PodArchiveHandler.cpp b/src/Archive/Formats/PodArchiveHandler.cpp
@@ -35,7 +35,7 @@
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
 #include "General/Console.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "MainEditor/MainEditor.h"
 #include "Utility/StringUtils.h"
 

diff --git a/src/Archive/Formats/ResArchiveHandler.cpp b/src/Archive/Formats/ResArchiveHandler.cpp
@@ -35,7 +35,7 @@
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
 #include "Archive/EntryType/EntryType.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 
 using namespace slade;
 

diff --git a/src/Archive/Formats/RffArchiveHandler.cpp b/src/Archive/Formats/RffArchiveHandler.cpp
@@ -69,7 +69,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 
 using namespace slade;
 

diff --git a/src/Archive/Formats/SiNArchiveHandler.cpp b/src/Archive/Formats/SiNArchiveHandler.cpp
@@ -35,7 +35,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;

diff --git a/src/Archive/Formats/TarArchiveHandler.cpp b/src/Archive/Formats/TarArchiveHandler.cpp
@@ -34,7 +34,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;

diff --git a/src/Archive/Formats/Wad2ArchiveHandler.cpp b/src/Archive/Formats/Wad2ArchiveHandler.cpp
@@ -36,7 +36,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 
 using namespace slade;
 

diff --git a/src/Archive/Formats/WadArchiveHandler.cpp b/src/Archive/Formats/WadArchiveHandler.cpp
@@ -36,7 +36,7 @@
 #include "Archive/ArchiveEntry.h"
 #include "Archive/EntryType/EntryType.h"
 #include "Archive/MapDesc.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 #include "Utility/Tokenizer.h"
 #include "WadJArchiveHandler.h"

diff --git a/src/Archive/Formats/WadJArchiveHandler.cpp b/src/Archive/Formats/WadJArchiveHandler.cpp
@@ -35,7 +35,7 @@
 #include "Archive/Archive.h"
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;

diff --git a/src/Archive/Formats/WolfArchiveHandler.cpp b/src/Archive/Formats/WolfArchiveHandler.cpp
@@ -35,7 +35,7 @@
 #include "Archive/ArchiveDir.h"
 #include "Archive/ArchiveEntry.h"
 #include "Archive/EntryType/EntryType.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Utility/FileUtils.h"
 #include "Utility/StringUtils.h"
 #ifndef _WIN32

diff --git a/src/Archive/Formats/ZipArchiveHandler.cpp b/src/Archive/Formats/ZipArchiveHandler.cpp
@@ -38,7 +38,7 @@
 #include "Archive/EntryType/EntryType.h"
 #include "Archive/MapDesc.h"
 #include "General/Misc.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "UI/WxUtils.h"
 #include "Utility/FileUtils.h"
 #include "Utility/StringUtils.h"

diff --git a/src/MainEditor/ArchiveOperations.cpp b/src/MainEditor/ArchiveOperations.cpp
@@ -40,7 +40,7 @@
 #include "Archive/MapDesc.h"
 #include "General/Console.h"
 #include "General/ResourceManager.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "Graphics/CTexture/PatchTable.h"
 #include "Graphics/CTexture/TextureXList.h"
 #include "MainEditor/MainEditor.h"

diff --git a/src/MainEditor/EntryOperations.cpp b/src/MainEditor/EntryOperations.cpp
@@ -43,7 +43,7 @@
 #include "BinaryControlLump.h"
 #include "Conversions.h"
 #include "General/Misc.h"
-#include "General/UI.h"
+#include "UI/UI.h"
 #include "General/UndoRedo.h"
 #include "General/UndoSteps/EntryDataUS.h"
 #include "Graphics/CTexture/CTexture.h"

diff --git a/src/MainEditor/UI/ArchiveManagerPanel.cpp b/src/MainEditor/UI/ArchiveManagerPanel.cpp
@@ -42,7 +42,6 @@
 #include "ArchivePanel.h"
 #include "EntryPanel/EntryPanel.h"
 #include "General/SAction.h"
-#include "General/UI.h"
 #include "Graphics/Icons.h"
 #include "MainEditor/ArchiveOperations.h"
 #include "MainEditor/MainEditor.h"
@@ -55,6 +54,7 @@
 #include "UI/Dialogs/NewArchiveDiaog.h"
 #include "UI/Layout.h"
 #include "UI/Lists/ListView.h"
+#include "UI/UI.h"
 #include "UI/WxUtils.h"
 #include "Utility/StringUtils.h"
 
@@ -424,7 +424,7 @@ void ArchiveManagerPanel::createArchivesPanel(const ui::LayoutHelper& lh)
 	panel_archives_->SetSizer(vbox);
 	vbox->Add(new wxStaticText(panel_archives_, -1, "Open Archives:"), wxSizerFlags().Expand());
 	list_archives_ = new ListView(panel_archives_, -1);
-	vbox->Add(list_archives_, lh.sfWithMinBorder(1, wxTOP).Expand());
+	vbox->Add(list_archives_, lh.sfWithSmallBorder(1, wxTOP).Expand());
 }
 
 // -----------------------------------------------------------------------------
@@ -437,7 +437,7 @@ void ArchiveManagerPanel::createRecentPanel(const ui::LayoutHelper& lh)
 	panel_rf_->SetSizer(vbox);
 	vbox->Add(new wxStaticText(panel_rf_, -1, "Recent Files:"), wxSizerFlags().Expand());
 	list_recent_ = new ListView(panel_rf_, -1);
-	vbox->Add(list_recent_, lh.sfWithMinBorder(1, wxTOP).Expand());
+	vbox->Add(list_recent_, lh.sfWithSmallBorder(1, wxTOP).Expand());
 
 	// Setup image list
 	auto list = wxutil::createSmallImageList();

diff --git a/src/MainEditor/UI/ArchivePanel.cpp b/src/MainEditor/UI/ArchivePanel.cpp
@@ -56,7 +56,6 @@
 #include "General/Executables.h"
 #include "General/KeyBind.h"
 #include "General/SAction.h"
-#include "General/UI.h"
 #include "General/UndoRedo.h"
 #include "General/UndoSteps/EntryDataUS.h"
 #include "Graphics/Palette/PaletteManager.h"
@@ -82,6 +81,7 @@
 #include "UI/Lists/ArchiveEntryTree.h"
 #include "UI/SToolBar/SToolBar.h"
 #include "UI/SToolBar/SToolBarButton.h"
+#include "UI/UI.h"
 #include "UI/WxUtils.h"
 #include "Utility/SFileDialog.h"
 #include "Utility/StringUtils.h"
@@ -365,9 +365,9 @@ void ArchivePanel::setup(const Archive* archive)
 	// Setup splitter
 	splitter_->SetMinimumPaneSize(FromDIP(300));
 	m_hbox->Add(splitter_, ui::LayoutHelper(this).sfWithBorder(1).Expand());
-	int split_pos = ap_splitter_position_list;
+	int split_pos = FromDIP(ap_splitter_position_list);
 	if (archive && archive->formatInfo().supports_dirs)
-		split_pos = ap_splitter_position_tree;
+		split_pos = FromDIP(ap_splitter_position_tree);
 	splitter_->SplitVertically(elist_panel, cur_area_, split_pos);
 
 	// Update size+layout
@@ -398,9 +398,9 @@ void ArchivePanel::bindEvents(Archive* archive)
 			if (auto archive = archive_.lock().get())
 			{
 				if (archive->formatInfo().supports_dirs)
-					ap_splitter_position_tree = e.GetSashPosition();
+					ap_splitter_position_tree = ToDIP(e.GetSashPosition());
 				else
-					ap_splitter_position_list = e.GetSashPosition();
+					ap_splitter_position_list = ToDIP(e.GetSashPosition());
 			}
 		});
 
@@ -527,13 +527,13 @@ wxPanel* ArchivePanel::createEntryListPanel(wxWindow* parent)
 
 	// Layout entry list
 	hbox->Add(toolbar_elist_, wxSizerFlags().Expand());
-	hbox->AddSpacer(lh.padMin());
+	hbox->AddSpacer(lh.padSmall());
 	auto* vbox = new wxBoxSizer(wxVERTICAL);
-	hbox->Add(vbox, lh.sfWithMinBorder(1, wxRIGHT).Expand());
+	hbox->Add(vbox, lh.sfWithSmallBorder(1, wxRIGHT).Expand());
 	if (etree_path_)
 	{
 		vbox->Add(etree_path_, wxSizerFlags().Expand());
-		vbox->AddSpacer(lh.padMin());
+		vbox->AddSpacer(lh.padSmall());
 		vbox->Add(entry_tree_, wxSizerFlags(1).Expand());
 	}
 	else

diff --git a/src/MainEditor/UI/EntryPanel/AudioEntryPanel.cpp b/src/MainEditor/UI/EntryPanel/AudioEntryPanel.cpp
@@ -39,11 +39,10 @@
 #include "Audio/ModMusic.h"
 #include "Audio/Mp3Music.h"
 #include "Audio/Music.h"
-#include "General/UI.h"
 #include "MainEditor/Conversions.h"
 #include "UI/Controls/SIconButton.h"
+#include "UI/Layout.h"
 #include "UI/SToolBar/SToolBar.h"
-#include "UI/WxUtils.h"
 #include "Utility/StringUtils.h"
 
 using namespace slade;
@@ -78,10 +77,10 @@ AudioEntryPanel::AudioEntryPanel(wxWindow* parent) :
 	mod_{ new audio::ModMusic() },
 	mp3_{ new audio::Mp3Music() }
 {
-	namespace wx = wxutil;
+	auto lh = ui::LayoutHelper(this);
 
 	// Setup sizer
-	auto sizer_gb = new wxGridBagSizer(ui::pad(), ui::pad());
+	auto sizer_gb = new wxGridBagSizer(lh.pad(), lh.pad());
 	sizer_main_->AddStretchSpacer();
 	sizer_main_->Add(sizer_gb, wxSizerFlags().Center());
 	sizer_main_->AddStretchSpacer();
@@ -103,20 +102,15 @@ AudioEntryPanel::AudioEntryPanel(wxWindow* parent) :
 	sizer_gb->Add(btn_next_, wxGBPosition(1, 4));
 
 	// Separator
-	sizer_gb->Add(new wxStaticLine(this), { 2, 0 }, { 1, 9 }, wxEXPAND | wxTOP | wxBOTTOM, ui::pad());
+	sizer_gb->Add(new wxStaticLine(this), { 2, 0 }, { 1, 9 }, wxEXPAND | wxTOP | wxBOTTOM, lh.pad());
 
 	// Add title
 	txt_title_ = new wxStaticText(this, -1, wxEmptyString);
 	sizer_gb->Add(txt_title_, wxGBPosition(3, 0), wxGBSpan(1, 9));
 
 	// Add info
 	txt_info_ = new wxTextCtrl(
-		this,
-		-1,
-		wxEmptyString,
-		wxDefaultPosition,
-		{ -1, FromDIP(200) },
-		wxTE_MULTILINE | wxTE_READONLY | wxTE_BESTWRAP);
+		this, -1, wxEmptyString, wxDefaultPosition, lh.size(-1, 200), wxTE_MULTILINE | wxTE_READONLY | wxTE_BESTWRAP);
 	sizer_gb->Add(txt_info_, wxGBPosition(4, 0), wxGBSpan(1, 9), wxEXPAND | wxHORIZONTAL);
 
 	// Add track number
@@ -132,7 +126,7 @@ AudioEntryPanel::AudioEntryPanel(wxWindow* parent) :
 
 	// Add volume slider
 	sizer_gb->Add(new wxStaticText(this, -1, "Volume:"), wxGBPosition(1, 7), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	slider_volume_ = new wxSlider(this, -1, 0, 0, 100, wxDefaultPosition, wxSize(FromDIP(128), -1));
+	slider_volume_ = new wxSlider(this, -1, 0, 0, 100, wxDefaultPosition, lh.size(128, -1));
 	slider_volume_->SetValue(snd_volume);
 	sizer_gb->Add(slider_volume_, wxGBPosition(1, 8), { 1, 1 }, wxALIGN_CENTER_VERTICAL);