mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Whitespace

Browse source
This commit is contained in:
jules 2018-02-24 13:40:56 +00:00
parent 5d9eabb084
commit edbeb50eeb
2 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp
View file

@ -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)
{