From 3b65c5c37d4971db11799f28180c7df6f2a8bcfe Mon Sep 17 00:00:00 2001 From: Timur Doumler Date: Wed, 13 Apr 2016 11:41:43 +0100 Subject: [PATCH] Projucer AppearanceSettingsTab: added missing resized() function; moved declaration into header and added explanatory comment. --- .../Application/jucer_GlobalPreferences.cpp | 24 ++++++------------- .../Application/jucer_GlobalPreferences.h | 23 ++++++++++++++++++ 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/extras/Projucer/Source/Application/jucer_GlobalPreferences.cpp b/extras/Projucer/Source/Application/jucer_GlobalPreferences.cpp index 014628c773..ad54227755 100644 --- a/extras/Projucer/Source/Application/jucer_GlobalPreferences.cpp +++ b/extras/Projucer/Source/Application/jucer_GlobalPreferences.cpp @@ -27,21 +27,6 @@ #include "../Utility/jucer_FloatingToolWindow.h" #include "../Utility/jucer_ColourPropertyComponent.h" - -//============================================================================== -class AppearanceSettingsTab : public GlobalPreferencesTab, - public Component -{ -public: - AppearanceSettingsTab(); - - Component* getContent() override; - void changeContent (Component* newContent); - String getName() const noexcept override; - - ScopedPointer content; -}; - //============================================================================== PathSettingsTab::PathSettingsTab (DependencyPathOS os) { @@ -365,8 +350,8 @@ Component* AppearanceSettingsTab::getContent() void AppearanceSettingsTab::changeContent (Component* newContent) { content = newContent; - addAndMakeVisible(content); - content->setBoundsInset(BorderSize()); + addAndMakeVisible (content); + content->setBounds (getLocalBounds()); } String AppearanceSettingsTab::getName() const noexcept @@ -374,6 +359,11 @@ String AppearanceSettingsTab::getName() const noexcept return "Code Editor"; } +void AppearanceSettingsTab::resized() +{ + content->setBounds (getLocalBounds()); +} + //============================================================================== GlobalPreferencesComponent::GlobalPreferencesComponent() : TabbedComponent (TabbedButtonBar::TabsAtTop) diff --git a/extras/Projucer/Source/Application/jucer_GlobalPreferences.h b/extras/Projucer/Source/Application/jucer_GlobalPreferences.h index 2b8275bd50..c1720fac29 100644 --- a/extras/Projucer/Source/Application/jucer_GlobalPreferences.h +++ b/extras/Projucer/Source/Application/jucer_GlobalPreferences.h @@ -74,6 +74,29 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PathSettingsTab) }; +//============================================================================== +/** This component implements the "Code Editor" tabl in the global preferences window, + which sets font sizes and colours for the Projucer's code editor. + The content is either an EditorPanel (the actual settings tab) or a FontScanPanel + (shown if the tab is scanning for available fonts before showing the EditorPanel). +*/ +class AppearanceSettingsTab : public GlobalPreferencesTab, + public Component +{ +public: + AppearanceSettingsTab(); + + Component* getContent() override; + void changeContent (Component* newContent); + String getName() const noexcept override; + + void resized() override; + +private: + ScopedPointer content; + + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AppearanceSettingsTab) +}; //============================================================================== class GlobalPreferencesComponent : public TabbedComponent