From bfab477aead2b4376e9caa193dca2c62c2ff26f9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 8 May 2012 01:03:20 +0300 Subject: Add titlepadding option to theme file. Now used only in shortcuts window without title bar. --- src/gui/theme.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/gui/theme.cpp') diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 4112a702f..311863f41 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -65,7 +65,7 @@ static void initDefaultThemePath() Skin::Skin(ImageRect skin, Image *close, Image *stickyUp, Image *stickyDown, const std::string &filePath, - const std::string &name, int padding): + const std::string &name, int padding, int titlePadding): instances(0), mFilePath(filePath), mName(name), @@ -73,8 +73,10 @@ Skin::Skin(ImageRect skin, Image *close, Image *stickyUp, Image *stickyDown, mCloseImage(close), mStickyImageUp(stickyUp), mStickyImageDown(stickyDown), - mPadding(padding) -{} + mPadding(padding), + mTitlePadding(titlePadding) +{ +} Skin::~Skin() { @@ -337,6 +339,7 @@ Skin *Theme::readSkin(const std::string &filename) ImageRect border; memset(&border, 0, sizeof(ImageRect)); int padding = 3; + int titlePadding = 4; // iterate 's for_each_xml_child_node(widgetNode, rootNode) @@ -485,6 +488,8 @@ Skin *Theme::readSkin(const std::string &filename) partNode, "name", ""); if (name == "padding") padding = XML::getProperty(partNode, "value", 3); + else if (name == "titlePadding") + titlePadding = XML::getProperty(partNode, "value", 4); } } } @@ -514,7 +519,7 @@ Skin *Theme::readSkin(const std::string &filename) } Skin *skin = new Skin(border, closeImage, stickyImageUp, stickyImageDown, - filename, "", padding); + filename, "", padding, titlePadding); skin->updateAlpha(mMinimumOpacity); return skin; } -- cgit v1.2.3-60-g2f50