gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix crash and focus bug

This commit is contained in:
Eduardo Bart 2012-03-30 04:39:46 -03:00
parent 20e32ad2a0
commit c13a5b5dab
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/otclientrc.lua
View File

@ -1,5 +1,4 @@
-- this file is loaded after all modules are loaded and initialized -- this file is loaded after all modules are loaded and initialized
-- you can place any custom user code here -- you can place any custom user code here
-- you
Keyboard.bindKeyDown('Ctrl+R', Client.reloadScripts) Keyboard.bindKeyDown('Ctrl+R', Client.reloadScripts)

2
src/framework/graphics/texturemanager.cpp
View File

@ -22,6 +22,7 @@
#include "texturemanager.h" #include "texturemanager.h"
#include "animatedtexture.h" #include "animatedtexture.h"
#include "graphics.h"
#include <framework/core/resourcemanager.h> #include <framework/core/resourcemanager.h>
#include <framework/thirdparty/apngloader.h> #include <framework/thirdparty/apngloader.h>
@ -54,6 +55,7 @@ TexturePtr TextureManager::getTexture(const std::string& textureFile)
texture = loadPNG(fin); texture = loadPNG(fin);
} catch(Exception& e) { } catch(Exception& e) {
logError("unable to load texture '", textureFile, "': ", e.what()); logError("unable to load texture '", textureFile, "': ", e.what());
texture = g_graphics.getEmptyTexture();
} }
} }

4
src/framework/ui/uiwidget.cpp
View File

@ -245,7 +245,7 @@ void UIWidget::focusChild(const UIWidgetPtr& child, Fw::FocusReason reason)
child->updateState(Fw::FocusState); child->updateState(Fw::FocusState);
child->updateState(Fw::ActiveState); child->updateState(Fw::ActiveState);
g_eventDispatcher.addEvent(std::bind(&UIWidget::onFocusChange, child, true, reason)); child->onFocusChange(true, reason);
} }
if(oldFocused) { if(oldFocused) {
@ -253,7 +253,7 @@ void UIWidget::focusChild(const UIWidgetPtr& child, Fw::FocusReason reason)
oldFocused->updateState(Fw::FocusState); oldFocused->updateState(Fw::FocusState);
oldFocused->updateState(Fw::ActiveState); oldFocused->updateState(Fw::ActiveState);
g_eventDispatcher.addEvent(std::bind(&UIWidget::onFocusChange, oldFocused, false, reason)); oldFocused->onFocusChange(false, reason);
} }
onChildFocusChange(child, oldFocused, reason); onChildFocusChange(child, oldFocused, reason);