summaryrefslogtreecommitdiff
path: root/src/gui/widgets/window.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-05-01 23:13:02 +0300
committerAndrei Karas <akaras@inbox.ru>2013-05-02 00:55:47 +0300
commit209fdbeaf69176fdab23604e820a73103e66776d (patch)
tree70cb2c329035dcca2024c632b17620e823d50076 /src/gui/widgets/window.cpp
parent721e1aa49134fb55241728528256b8662a5bb160 (diff)
downloadmv-209fdbeaf69176fdab23604e820a73103e66776d.tar.gz
mv-209fdbeaf69176fdab23604e820a73103e66776d.tar.bz2
mv-209fdbeaf69176fdab23604e820a73103e66776d.tar.xz
mv-209fdbeaf69176fdab23604e820a73103e66776d.zip
Fix tilebar padding with different font sizes.
Fix paddings in outfits window.
Diffstat (limited to 'src/gui/widgets/window.cpp')
-rw-r--r--src/gui/widgets/window.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 0619a85a9..ad8014ee8 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -116,8 +116,7 @@ Window::Window(const std::string &caption, const bool modal,
setPadding(mSkin->getPadding());
if (getOptionBool("titlebarBold"))
mCaptionFont = reinterpret_cast<gcn::Font*>(boldFont);
- setTitlePadding(mSkin->getTitlePadding());
- setTitleBarHeight(getOption("titlebarHeight"));
+ mTitlePadding = mSkin->getTitlePadding();
mGripPadding = getOption("resizePadding");
mCaptionOffsetX = getOption("captionoffsetx");
if (!mCaptionOffsetX)
@@ -131,6 +130,10 @@ Window::Window(const std::string &caption, const bool modal,
{
mCaptionAlign = gcn::Graphics::LEFT;
}
+ setTitleBarHeight(getOption("titlebarHeight"));
+ if (!mTitleBarHeight)
+ mTitleBarHeight = mCaptionFont->getHeight();
+
setPalette(getOption("palette"));
childPalette = getOption("childPalette");
}