Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-12-26 17:57:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui and graphics changes

Browse Source 
* implement draw clipping using opengl stencil buffers
* allow to create Widgets by style name with g_ui.createWidgetByStyle
* styles can now have children widgets
* make proper use of the isNotPathable in pathfinding
* add scrollbar skin
This commit is contained in:
Eduardo Bart
2012-03-24 12:22:40 -03:00
parent efa9811342
commit de0008caf1
34 changed files with 210 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ void UIManager::terminate()
void UIManager::render()
{
m_rootWidget->draw();
m_rootWidget->draw(m_rootWidget->getRect());
}
void UIManager::resize(const Size& size)
@@ -349,23 +349,24 @@ UIWidgetPtr UIManager::loadUI(const std::string& file, const UIWidgetPtr& parent
else {
if(widget)
Fw::throwException("cannot have multiple main widgets in otui files");
widget = loadWidgetFromOTML(node, parent);
widget = createWidgetFromOTML(node, parent);
}
}
return widget;
} catch(Exception& e) {
logError("Failed to load UI from '", file, "': ", e.what());
logError("failed to load UI from '", file, "': ", e.what());
return nullptr;
}
}
/*
UIWidgetPtr UIManager::loadWidgetFromStyle()
{
UIWidgetPtr UIManager::createWidgetFromStyle(const std::string& styleName, const UIWidgetPtr& parent)
{
OTMLNodePtr node = OTMLNode::create(styleName);
return createWidgetFromOTML(node, parent);
}
*/
UIWidgetPtr UIManager::loadWidgetFromOTML(const OTMLNodePtr& widgetNode, const UIWidgetPtr& parent)
UIWidgetPtr UIManager::createWidgetFromOTML(const OTMLNodePtr& widgetNode, const UIWidgetPtr& parent)
{
OTMLNodePtr originalStyleNode = getStyle(widgetNode->tag());
if(!originalStyleNode)
@@ -384,9 +385,11 @@ UIWidgetPtr UIManager::loadWidgetFromOTML(const OTMLNodePtr& widgetNode, const U
if(widget) {
widget->setStyleFromNode(styleNode);
for(const OTMLNodePtr& childNode : widgetNode->children()) {
if(!childNode->isUnique())
loadWidgetFromOTML(childNode, widget);
for(const OTMLNodePtr& childNode : styleNode->children()) {
if(!childNode->isUnique()) {
createWidgetFromOTML(childNode, widget);
styleNode->removeChild(childNode);
}
}
} else
Fw::throwException("unable to create widget of type '", widgetType, "'");