diff options
| author | Vojtech Bocek <vbocek@gmail.com> | 2013-10-11 14:40:01 +0200 |
|---|---|---|
| committer | Vojtech Bocek <vbocek@gmail.com> | 2013-10-11 14:41:39 +0200 |
| commit | 6041a78f8f8ab08258c1ef16146e49ecf2ee81b0 (patch) | |
| tree | d915d531e7ce11e5ab37244a53d16d23853ab80f | |
| parent | Merge "check for space after = too" into twrp2.7 (diff) | |
| download | android_bootable_recovery-6041a78f8f8ab08258c1ef16146e49ecf2ee81b0.tar android_bootable_recovery-6041a78f8f8ab08258c1ef16146e49ecf2ee81b0.tar.gz android_bootable_recovery-6041a78f8f8ab08258c1ef16146e49ecf2ee81b0.tar.bz2 android_bootable_recovery-6041a78f8f8ab08258c1ef16146e49ecf2ee81b0.tar.lz android_bootable_recovery-6041a78f8f8ab08258c1ef16146e49ecf2ee81b0.tar.xz android_bootable_recovery-6041a78f8f8ab08258c1ef16146e49ecf2ee81b0.tar.zst android_bootable_recovery-6041a78f8f8ab08258c1ef16146e49ecf2ee81b0.zip | |
| -rw-r--r-- | gui/image.cpp | 5 | ||||
| -rw-r--r-- | gui/objects.hpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gui/image.cpp b/gui/image.cpp index 45d863673..31d9418d3 100644 --- a/gui/image.cpp +++ b/gui/image.cpp @@ -25,7 +25,7 @@ extern "C" { #include "rapidxml.hpp" #include "objects.hpp" -GUIImage::GUIImage(xml_node<>* node) +GUIImage::GUIImage(xml_node<>* node) : Conditional(node) { xml_attribute<>* attr; xml_node<>* child; @@ -79,6 +79,9 @@ GUIImage::GUIImage(xml_node<>* node) int GUIImage::Render(void) { + if (!isConditionTrue()) + return 0; + if (isHighlighted && mHighlightImage && mHighlightImage->GetResource()) { gr_blit(mHighlightImage->GetResource(), 0, 0, mRenderW, mRenderH, mRenderX, mRenderY); return 0; diff --git a/gui/objects.hpp b/gui/objects.hpp index 1e272b276..c259fd490 100644 --- a/gui/objects.hpp +++ b/gui/objects.hpp @@ -215,7 +215,7 @@ protected: }; // GUIImage - Used for static image -class GUIImage : public RenderObject +class GUIImage : public RenderObject, public Conditional { public: GUIImage(xml_node<>* node); |