summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-30 17:53:13 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-30 17:53:13 +0300
commit9bea13f0a8c965fd70fb7af44cfb27770f5a31e2 (patch)
tree455d26be0f11a2efba800458b70080e1c4a1c87c
parent28f76100017f5b1d2218dfc3b2551ed39e9922e1 (diff)
downloadmanaverse-9bea13f0a8c965fd70fb7af44cfb27770f5a31e2.tar.gz
manaverse-9bea13f0a8c965fd70fb7af44cfb27770f5a31e2.tar.bz2
manaverse-9bea13f0a8c965fd70fb7af44cfb27770f5a31e2.tar.xz
manaverse-9bea13f0a8c965fd70fb7af44cfb27770f5a31e2.zip
Show assert if any windows used without own skin file.
-rw-r--r--src/gui/widgets/window.cpp4
-rw-r--r--src/unittests/gui/windowmanager.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 3fb6c458e..704b30834 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -177,7 +177,11 @@ Window::Window(const std::string &caption,
setTitleBarHeight(20);
if (skin.empty())
+ {
+ reportAlways("Default skin was used for window: %s",
+ caption.c_str());
skin = "window.xml";
+ }
int childPalette = 1;
// Loads the skin
diff --git a/src/unittests/gui/windowmanager.cc b/src/unittests/gui/windowmanager.cc
index fdd653f71..d6f9eb51a 100644
--- a/src/unittests/gui/windowmanager.cc
+++ b/src/unittests/gui/windowmanager.cc
@@ -639,7 +639,7 @@ TEST_CASE("Windows tests", "windowmanager")
CREATEWIDGETV(itemShortcutWindow, ShortcutWindow,
"name",
container,
- std::string(),
+ "emotes.xml",
0,
0);
gui->draw();
@@ -650,7 +650,7 @@ TEST_CASE("Windows tests", "windowmanager")
{
CREATEWIDGETV(itemShortcutWindow, ShortcutWindow,
std::string(),
- std::string(),
+ "items.xml",
0,
0);
gui->draw();