summaryrefslogtreecommitdiff
path: root/hud
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2014-07-11 04:06:59 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2014-07-11 04:06:59 +0200
commita916863a8b852c33d69ac80430e4e4905d324338 (patch)
tree78e63a5ca8cbd8996315bae0656c763f0431b279 /hud
parente7816079c6a26b8a84f6c35a1d34fe8b87d03475 (diff)
HudButton: change the label property as a Read-only, fix failing test
(bzr r3830.6.6)
Diffstat (limited to 'hud')
-rw-r--r--hud/HudButton.cpp1
-rw-r--r--hud/HudButton.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/hud/HudButton.cpp b/hud/HudButton.cpp
index f0cb1dad6..3ab96ac53 100644
--- a/hud/HudButton.cpp
+++ b/hud/HudButton.cpp
@@ -55,6 +55,7 @@ NUX_IMPLEMENT_OBJECT_TYPE(HudButton);
HudButton::HudButton(NUX_FILE_LINE_DECL)
: nux::Button(NUX_FILE_LINE_PARAM)
+ , label([this] { return query_ ? query_->formatted_text : ""; })
, is_rounded(false)
, fake_focused(false)
, scale(1.0)
diff --git a/hud/HudButton.h b/hud/HudButton.h
index 34c890769..5a6851993 100644
--- a/hud/HudButton.h
+++ b/hud/HudButton.h
@@ -50,7 +50,7 @@ public:
void SetSkipDraw(bool skip_draw);
- nux::Property<std::string> label;
+ nux::ROProperty<std::string> label;
nux::Property<bool> is_rounded;
nux::Property<bool> fake_focused;
nux::Property<double> scale;