Add support for updating a string.

atondwal · Jun 24, 2012 · ebdf030 · ebdf030
1 parent 6370107
commit ebdf030
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/ui/label.cpp b/ui/label.cpp
@@ -4,7 +4,7 @@
 
 //UILabel
 
-UILabel::UILabel(const std::string& text, bool editable, float width, UIAction* action) : text(text), width(width), action(action), UIElement() {
+UILabel::UILabel(const std::string& text, bool editable, float width, UIAction* action, std::string* value) : text(text), value(value), width(width), action(action), UIElement() {
 
     slider       = 0;
     text_colour  = vec4(0.0f);
@@ -60,6 +60,14 @@ void UILabel::backspace() {
 void UILabel::tab() {
 }
 
+bool UILabel::submit() {
+    if(value != 0) {
+        *value = text;
+        return true;
+    }
+    return false;
+}
+
 bool UILabel::keyPress(SDL_KeyboardEvent *e, char c) {
 
     if(!c) return false;
@@ -128,6 +136,13 @@ bool UILabel::keyPress(SDL_KeyboardEvent *e, char c) {
 
 void UILabel::update(float dt) {
 
+    if(editable && !selected && value != 0) {
+        if(*value != text) {
+            text = *value;
+            text_changed = true;
+        }
+    }
+
     if(selected && editable) {
         cursor_anim += dt;
         if(cursor_anim>=2.0f) cursor_anim=0.0f;
@@ -234,6 +249,17 @@ void UILabel::drawContent() {
 //    expanded = 0.0f;
 }
 
+//
+
+UILabelString::UILabelString(const std::string& label, std::string* value, bool editable, UIAction* action) : UILayout(true) {
+
+    addElement(new UILabel(label, false, 120.0f));
+    addElement(new UILabel(*value, editable, 213.0f, 0, value));
+
+    padding = vec2(5.0f, 0.0f);
+    scrollable = true;
+}
+
 //UIIntLabel
 
 UIIntLabel::UIIntLabel(int* value, bool editable, UIAction* action) : value(value), UILabel("", editable, -1.0f, action) {

diff --git a/ui/label.h b/ui/label.h
@@ -2,11 +2,13 @@
 #define UI_LABEL_H
 
 #include "element.h"
+#include "layout.h"
 #include "action.h"
 
 class UISlider;
 class UIFloatSlider;
 class UIColourSlider;
+class UILayout;
 
 class UILabel : public UIElement {
 protected:
@@ -17,6 +19,8 @@ class UILabel : public UIElement {
 
     UIAction* action;
 
+    std::string* value;
+
     void drawBackground();
 public:
     vec4 bgcolour;
@@ -28,7 +32,7 @@ class UILabel : public UIElement {
     std::string text;
     std::string display_text;
 
-    UILabel(const std::string& text, bool editable = false, float width = -1.0f, UIAction* action = 0);
+    UILabel(const std::string& text, bool editable = false, float width = -1.0f, UIAction* action = 0, std::string* value = 0);
 
     float width;
 
@@ -37,8 +41,11 @@ class UILabel : public UIElement {
     int getType() { return UI_LABEL; }
 
     virtual void tab();
+
     virtual void backspace();
 
+    bool submit();
+
     void setWidth(float width);
     void setText(const std::string& text);
     void setTextColour(const vec4& colour);
@@ -94,4 +101,9 @@ class UIColourLabel : public UIFloatLabel {
     void updateContent();
 };
 
+class UILabelString : public UILayout {
+public:
+    UILabelString(const std::string& label, std::string* value, bool editable = false, UIAction* action = 0);
+};
+
 #endif