From 6b4ecbdc40e397634235eead5daf7d711c9edb0c Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Mon, 8 Jun 2026 21:09:19 +0200 Subject: [PATCH] Create dedicated stylesheet for Atlas This is meant as a central place to tweak layout per platform. Signed-off-by: Ralph Sennhauser --- .../AtlasUI/ScenarioEditor/SectionLayout.cpp | 5 ++- .../AtlasUI/ScenarioEditor/SectionLayout.h | 12 ------ .../atlas/AtlasUI/ScenarioEditor/StyleSheet.h | 39 +++++++++++++++++++ 3 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 source/tools/atlas/AtlasUI/ScenarioEditor/StyleSheet.h diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp index cd0ae4e967..dcfb2d0a1f 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp @@ -28,6 +28,7 @@ #include "tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h" #include "tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h" #include "tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h" +#include "tools/atlas/AtlasUI/ScenarioEditor/StyleSheet.h" #include #include @@ -309,10 +310,10 @@ void SectionLayout::Build(ScenarioEditor& scenarioEditor) #undef ADD_SIDEBAR - m_VertSplitter->SetDefaultSashPosition(-BOTTOMBAR_SIZE); + m_VertSplitter->SetDefaultSashPosition(-Atlas::Style::BOTTOMBAR_DEFAULT_SIZE); m_VertSplitter->Initialize(m_Canvas); - m_HorizSplitter->SetDefaultSashPosition(SIDEBAR_SIZE); + m_HorizSplitter->SetDefaultSashPosition(Atlas::Style::SIDEBAR_DEFAULT_SIZE); m_HorizSplitter->SplitVertically(m_SidebarBook, m_VertSplitter); } diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h index 81c09c8555..6c3b02a7e5 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h @@ -27,18 +27,6 @@ class SnapSplitterWindow; class wxString; class wxWindow; -// Some platform dependent sizes -#if defined(__WXGTK__) - #define SIDEBAR_SIZE 285 - #define BOTTOMBAR_SIZE 200 -#elif defined(__WXOSX__) || defined(__WXMAC__) - #define SIDEBAR_SIZE 285 - #define BOTTOMBAR_SIZE 210 -#else // __MSW__ - #define SIDEBAR_SIZE 235 - #define BOTTOMBAR_SIZE 180 -#endif - class SectionLayout { public: diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/StyleSheet.h b/source/tools/atlas/AtlasUI/ScenarioEditor/StyleSheet.h new file mode 100644 index 0000000000..50fae403e9 --- /dev/null +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/StyleSheet.h @@ -0,0 +1,39 @@ +/* Copyright (C) 2026 Wildfire Games. + * This file is part of 0 A.D. + * + * 0 A.D. is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * 0 A.D. is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with 0 A.D. If not, see . + */ + +#ifndef INCLUDED_ATLAS_STYLESHEET +#define INCLUDED_ATLAS_STYLESHEET + +namespace Atlas::Style +{ + +// Platform specific values + +#if defined(__WXGTK__) +constexpr int BOTTOMBAR_DEFAULT_SIZE = 200; +constexpr int SIDEBAR_DEFAULT_SIZE = 285; +#elif defined(__WXOSX__) || defined(__WXMAC__) +constexpr int BOTTOMBAR_DEFAULT_SIZE = 210; +constexpr int SIDEBAR_DEFAULT_SIZE = 285; +#else // __MSW__ +constexpr int BOTTOMBAR_DEFAULT_SIZE = 180; +constexpr int SIDEBAR_DEFAULT_SIZE = 235; +#endif + +} // namespace Atlas::Style + +#endif // INCLUDED_ATLAS_STYLESHEET