Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-14 11:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Background label hide function, Skins fix and combobox hide, messagebox changes, show entergame when reload

Browse Source
This commit is contained in:
Henrique Santiago
2012-08-06 16:15:20 -03:00
parent 9cb4cb9a58
commit e6bd3907e1
8 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/framework/ui/uimanager.cpp
View File

@@ -340,14 +340,15 @@ void UIManager::importStyleFromOTML(const OTMLNodePtr& styleNode)
styleNode->writeAt("__unique", true);
}
OTMLNodePtr oldStyle = m_styles[name];
// Warn about redefined styles
if(!g_app.isRunning() && !unique) {
if(!g_app.isRunning() && (oldStyle && !oldStyle->valueAt("__unique", false))) {
auto it = m_styles.find(name);
if(it != m_styles.end())
g_logger.warning(stdext::format("style '%s' is being redefined", name));
}
OTMLNodePtr oldStyle = m_styles[name];
if(!oldStyle || !oldStyle->valueAt("__unique", false) || unique) {
OTMLNodePtr originalStyle = getStyle(base);
if(!originalStyle)