From 003043714367009efaf07015cc63a901ae2ee47c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 27 Dec 2017 03:30:58 +0300 Subject: Remove default parameters from theme. --- src/gui/theme.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src/gui/theme.cpp') diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 6d9c572ba..171415ec0 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -1095,7 +1095,10 @@ void Theme::loadRect(ImageRect &image, const int start, const int end) { - Skin *const skin = load(name, name2, false); + Skin *const skin = load(name, + name2, + false, + theme->getThemePath()); if (skin != nullptr) { loadGrid(); @@ -1109,7 +1112,10 @@ Skin *Theme::loadSkinRect(ImageRect &image, const int start, const int end) { - Skin *const skin = load(name, name2); + Skin *const skin = load(name, + name2, + true, + theme->getThemePath()); if (skin != nullptr) loadGrid(); return skin; @@ -1132,7 +1138,10 @@ Image *Theme::getImageFromThemeXml(const std::string &name, if (theme == nullptr) return nullptr; - Skin *const skin = theme->load(name, name2, false); + Skin *const skin = theme->load(name, + name2, + false, + theme->getThemePath()); if (skin != nullptr) { const ImageRect &rect = skin->getBorder(); @@ -1155,7 +1164,10 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name, if (theme == nullptr) return nullptr; - Skin *const skin = theme->load(name, name2, false); + Skin *const skin = theme->load(name, + name2, + false, + theme->getThemePath()); if (skin != nullptr) { const ImageRect &rect = skin->getBorder(); -- cgit v1.2.3-60-g2f50