mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 07:09:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2066 from akortunov/guifixes

Browse source 
Do not read font size just for every single widget
This commit is contained in:
Bret Curtis 2019-01-07 17:17:57 +01:00 committed by GitHub
commit 65a6b10995
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
components/widgets/fontwrapper.hpp
View file

@ -14,18 +14,10 @@ namespace Gui
virtual void setFontName(const std::string& name) virtual void setFontName(const std::string& name)
{ {
T::setFontName(name); T::setFontName(name);
T::setPropertyOverride ("FontHeight", mFontSize); T::setPropertyOverride ("FontHeight", getFontSize());
} }
protected: protected:
FontWrapper()
{
// Note: we can not use the WindowManager here, so there is a code duplication a bit.
int fontSize = Settings::Manager::getInt("font size", "GUI");
fontSize = std::min(std::max(12, fontSize), 20);
mFontSize = std::to_string(fontSize);
}
virtual void setPropertyOverride(const std::string& _key, const std::string& _value) virtual void setPropertyOverride(const std::string& _key, const std::string& _value)
{ {
T::setPropertyOverride (_key, _value); T::setPropertyOverride (_key, _value);
@ -34,11 +26,22 @@ namespace Gui
// We should restore it. // We should restore it.
if (_key == "FontName") if (_key == "FontName")
{ {
T::setPropertyOverride ("FontHeight", mFontSize); T::setPropertyOverride ("FontHeight", getFontSize());
} }
} }
std::string mFontSize; private:
static int clamp(const int& value, const int& lowBound, const int& highBound)
{
return std::min(std::max(lowBound, value), highBound);
}
std::string getFontSize()
{
// Note: we can not use the WindowManager here, so there is a code duplication a bit.
static const std::string fontSize = std::to_string(clamp(Settings::Manager::getInt("font size", "GUI"), 12, 20));
return fontSize;
}
}; };
} }