diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-27 03:30:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-27 03:30:58 +0300 |
| commit | 003043714367009efaf07015cc63a901ae2ee47c (patch) | |
| tree | f441091a46ac07419977a0dba4cfd6b5ceab667b /src/input | |
| parent | 916a3d76da98d078a807044c43d1a70bc146ba70 (diff) | |
| download | manaverse-003043714367009efaf07015cc63a901ae2ee47c.tar.gz manaverse-003043714367009efaf07015cc63a901ae2ee47c.tar.bz2 manaverse-003043714367009efaf07015cc63a901ae2ee47c.tar.xz manaverse-003043714367009efaf07015cc63a901ae2ee47c.zip | |
Remove default parameters from theme.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/touch/touchmanager.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/input/touch/touchmanager.cpp b/src/input/touch/touchmanager.cpp index df98e667f..ec2d71760 100644 --- a/src/input/touch/touchmanager.cpp +++ b/src/input/touch/touchmanager.cpp @@ -143,7 +143,11 @@ void TouchManager::loadTouchItem(TouchItem **restrict item, else icon = Theme::getImageFromThemeXml(imageName, ""); - Skin *const skin = theme->loadSkinRect(*images, name, ""); + Skin *const skin = theme->loadSkinRect(*images, + name, + "", + 0, + 8); if (skin != nullptr) { Image *const image = images->grid[0]; @@ -389,7 +393,7 @@ void TouchManager::unload(TouchItem *restrict const item) { if (item->images != nullptr) { - Theme::unloadRect(*item->images); + Theme::unloadRect(*item->images, 0, 8); delete2(item->images); if (item->icon != nullptr) { @@ -427,7 +431,10 @@ void TouchManager::loadButtons() restrict2 const int sz = (mButtonsSize + 1) * 50; if (theme == nullptr) return; - Skin *const skin = theme->load("dbutton.xml", ""); + Skin *const skin = theme->load("dbutton.xml", + "", + true, + theme->getThemePath()); if (skin != nullptr) { |