From edbeb50eebecb969485a9ede529f4a61d97567f0 Mon Sep 17 00:00:00 2001 From: jules Date: Sat, 24 Feb 2018 13:40:56 +0000 Subject: [PATCH] Whitespace --- .../lookandfeel/juce_LookAndFeel.cpp | 34 +++++++++---------- .../lookandfeel/juce_LookAndFeel.h | 24 ++++++------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp index 76746693b5..0159d6f747 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp @@ -119,40 +119,40 @@ void LookAndFeel::setDefaultLookAndFeel (LookAndFeel* newDefaultLookAndFeel) noe Typeface::Ptr LookAndFeel::getTypefaceForFont (const Font& font) { if (font.getTypefaceName() == Font::getDefaultSansSerifFontName()) - { - if (defaultTypeface != nullptr) - return defaultTypeface; - - if (defaultSans.isNotEmpty()) + { + if (defaultTypeface != nullptr) + return defaultTypeface; + + if (defaultSans.isNotEmpty()) { Font f (font); f.setTypefaceName (defaultSans); - return Typeface::createSystemTypefaceFor (f); + return Typeface::createSystemTypefaceFor (f); } } return Font::getDefaultTypefaceForFont (font); } -void LookAndFeel::setDefaultSansSerifTypeface (Typeface::Ptr newDefaultTypeface) -{ - if (defaultTypeface != newDefaultTypeface) - { - defaultTypeface = newDefaultTypeface; - Typeface::clearTypefaceCache(); - } -} - +void LookAndFeel::setDefaultSansSerifTypeface (Typeface::Ptr newDefaultTypeface) +{ + if (defaultTypeface != newDefaultTypeface) + { + defaultTypeface = newDefaultTypeface; + Typeface::clearTypefaceCache(); + } +} + void LookAndFeel::setDefaultSansSerifTypefaceName (const String& newName) { if (defaultSans != newName) - { + { defaultTypeface = {}; Typeface::clearTypefaceCache(); defaultSans = newName; } } - + //============================================================================== MouseCursor LookAndFeel::getMouseCursorFor (Component& component) { diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h index 1a5d6cf27f..5d0879b266 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h @@ -163,24 +163,24 @@ public: //============================================================================== /** Returns the typeface that should be used for a given font. The default implementation just does what you'd expect it to, but you can override - this if you want to intercept fonts and use your own custom typeface object. + this if you want to intercept fonts and use your own custom typeface object. @see setDefaultTypeface */ virtual Typeface::Ptr getTypefaceForFont (const Font&); - - /** Allows you to supply a default typeface that will be returned as the default - sans-serif font. - Instead of a typeface object, you can specify a typeface by name using the - setDefaultSansSerifTypefaceName() method. - You can perform more complex typeface substitutions by overloading - getTypefaceForFont() but this lets you easily set a global typeface. - */ - void setDefaultSansSerifTypeface (Typeface::Ptr newDefaultTypeface); + + /** Allows you to supply a default typeface that will be returned as the default + sans-serif font. + Instead of a typeface object, you can specify a typeface by name using the + setDefaultSansSerifTypefaceName() method. + You can perform more complex typeface substitutions by overloading + getTypefaceForFont() but this lets you easily set a global typeface. + */ + void setDefaultSansSerifTypeface (Typeface::Ptr newDefaultTypeface); /** Allows you to change the default sans-serif font. If you need to supply your own Typeface object for any of the default fonts, rather than just supplying the name (e.g. if you want to use an embedded font), then - you can instead call setDefaultSansSerifTypeface() with an object to use. + you can instead call setDefaultSansSerifTypeface() with an object to use. */ void setDefaultSansSerifTypefaceName (const String& newName); @@ -232,7 +232,7 @@ private: }; SortedSet colours; - String defaultSans, defaultSerif, defaultFixed; + String defaultSans, defaultSerif, defaultFixed; Typeface::Ptr defaultTypeface; bool useNativeAlertWindows = false;