diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2015-02-18 21:35:00 +0100 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2015-02-21 15:14:24 +0100 |
| commit | 21ff02a69331fbcd53dc93a1af9a93618225b4bf (patch) | |
| tree | 623fe5a07a506362b91a16b34d62a875b3d45c32 /gui/console.cpp | |
| parent | gui: make kinetic scrolling deceleration more awesome (diff) | |
| download | android_bootable_recovery-21ff02a69331fbcd53dc93a1af9a93618225b4bf.tar android_bootable_recovery-21ff02a69331fbcd53dc93a1af9a93618225b4bf.tar.gz android_bootable_recovery-21ff02a69331fbcd53dc93a1af9a93618225b4bf.tar.bz2 android_bootable_recovery-21ff02a69331fbcd53dc93a1af9a93618225b4bf.tar.lz android_bootable_recovery-21ff02a69331fbcd53dc93a1af9a93618225b4bf.tar.xz android_bootable_recovery-21ff02a69331fbcd53dc93a1af9a93618225b4bf.tar.zst android_bootable_recovery-21ff02a69331fbcd53dc93a1af9a93618225b4bf.zip | |
Diffstat (limited to 'gui/console.cpp')
| -rw-r--r-- | gui/console.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gui/console.cpp b/gui/console.cpp index bb70400c9..3623f5558 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -101,7 +101,6 @@ extern "C" void gui_set_FILE(FILE* f) GUIConsole::GUIConsole(xml_node<>* node) : GUIObject(node) { - xml_attribute<>* attr; xml_node<>* child; mFont = NULL; @@ -126,13 +125,9 @@ GUIConsole::GUIConsole(xml_node<>* node) : GUIObject(node) } else { - child = node->first_node("font"); - if (child) - { - mFont = LoadAttrFont(child, "resource"); - } + mFont = LoadAttrFont(FindNode(node, "font"), "resource"); - child = node->first_node("color"); + child = FindNode(node, "color"); if (child) { mForegroundColor = LoadAttrColor(child, "foreground", mForegroundColor); @@ -141,9 +136,9 @@ GUIConsole::GUIConsole(xml_node<>* node) : GUIObject(node) } // Load the placement - LoadPlacement(node->first_node("placement"), &mConsoleX, &mConsoleY, &mConsoleW, &mConsoleH); + LoadPlacement(FindNode(node, "placement"), &mConsoleX, &mConsoleY, &mConsoleW, &mConsoleH); - child = node->first_node("slideout"); + child = FindNode(node, "slideout"); if (child) { mSlideout = 1; |