Browse Source

Projucer GUI editor font kerning retention fix

tags/2021-05-28
jules 7 years ago
parent
commit
a0f3952081
1 changed files with 9 additions and 7 deletions
  1. +9
    -7
      extras/Projucer/Source/ComponentEditor/Properties/jucer_FontPropertyComponent.h

+ 9
- 7
extras/Projucer/Source/ComponentEditor/Properties/jucer_FontPropertyComponent.h View File

@@ -82,16 +82,18 @@ public:
static Font applyNameToFont (const String& typefaceName, const Font& font)
{
if (typefaceName == getDefaultFont()) return Font (font.getHeight(), font.getStyleFlags());
if (typefaceName == getDefaultSans()) return Font (Font::getDefaultSansSerifFontName(), font.getHeight(), font.getStyleFlags());
if (typefaceName == getDefaultSerif()) return Font (Font::getDefaultSerifFontName(), font.getHeight(), font.getStyleFlags());
if (typefaceName == getDefaultMono()) return Font (Font::getDefaultMonospacedFontName(), font.getHeight(), font.getStyleFlags());
auto extraKerning = font.getExtraKerningFactor();
if (typefaceName == getDefaultFont()) return Font (font.getHeight(), font.getStyleFlags()).withExtraKerningFactor (extraKerning);
if (typefaceName == getDefaultSans()) return Font (Font::getDefaultSansSerifFontName(), font.getHeight(), font.getStyleFlags()).withExtraKerningFactor (extraKerning);
if (typefaceName == getDefaultSerif()) return Font (Font::getDefaultSerifFontName(), font.getHeight(), font.getStyleFlags()).withExtraKerningFactor (extraKerning);
if (typefaceName == getDefaultMono()) return Font (Font::getDefaultMonospacedFontName(), font.getHeight(), font.getStyleFlags()).withExtraKerningFactor (extraKerning);
auto f = Font (typefaceName, font.getHeight(), font.getStyleFlags()).withExtraKerningFactor (extraKerning);
auto f = Font (typefaceName, font.getHeight(), font.getStyleFlags()).withExtraKerningFactor (font.getExtraKerningFactor());
if (f.getAvailableStyles().contains (font.getTypefaceStyle()))
{
f.setTypefaceStyle (font.getTypefaceStyle());
}
return f;
}


Loading…
Cancel
Save