From fc7d303ee446da2f6bd7b00585211ce00ff022c2 Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Mon, 29 Aug 2011 22:12:20 +0000 Subject: [PATCH] Adjusts Atlas sidebar and bottombar to look better on different platforms. This was SVN commit r10133. --- .../atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp | 4 ++-- .../atlas/AtlasUI/ScenarioEditor/SectionLayout.h | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp index 66ae3c4710..1f776ed297 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp @@ -299,10 +299,10 @@ void SectionLayout::Build(ScenarioEditor& scenarioEditor) #undef ADD_SIDEBAR - m_VertSplitter->SetDefaultSashPosition(-165); + m_VertSplitter->SetDefaultSashPosition(-BOTTOMBAR_SIZE); m_VertSplitter->Initialize(m_Canvas); - m_HorizSplitter->SetDefaultSashPosition(200); + m_HorizSplitter->SetDefaultSashPosition(SIDEBAR_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 cb8d128d4f..66af8d770b 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Wildfire Games. +/* Copyright (C) 2011 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -21,6 +21,18 @@ #include #include +// Some platform dependent sizes +#if defined(__WXGTK__) + #define SIDEBAR_SIZE 250 + #define BOTTOMBAR_SIZE 200 +#elif defined(__WXOSX__) || defined(__WXMAC__) + #define SIDEBAR_SIZE 250 + #define BOTTOMBAR_SIZE 210 +#else // __MSW__ + #define SIDEBAR_SIZE 200 + #define BOTTOMBAR_SIZE 180 +#endif + class ScenarioEditor; class SnapSplitterWindow; class SidebarBook;