Merge remote-tracking branch 'upstream/master'

midwan · Aug 25, 2024 · e8f4929 · e8f4929
2 parents e6ce273 + cac5cdb
commit e8f4929
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 19 deletions.
diff --git a/TODO b/TODO
@@ -1,4 +1,4 @@
-* Continue rebasing from a154429864dc2a948d29f21cdcdf688177bb54a8
+* Continue rebasing from a451b58f3da13d686702689ccbe92c44b8362c6e
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.

diff --git a/include/guisan/exception.hpp b/include/guisan/exception.hpp
@@ -61,12 +61,9 @@
 
 #include "guisan/platform.hpp"
 
-
-#ifdef _MSC_VER
-#if _MSC_VER <= 1200
-#define __FUNCTION__ "?"
-#endif
-#endif
+# ifndef __FUNCTION__
+#  define __FUNCTION__ "?"
+# endif
 
 /*
  * A macro used to create a standard exception object.
@@ -83,9 +80,9 @@ namespace gcn
 {
     /**
      * An exception containing a message, a file and a line number
-     * where the exception occured. Guisan will only throw exceptions 
-     * of this class. 
-     * 
+     * where the exception occured. Guisan will only throw exceptions
+     * of this class.
+     *
      * You can use this class for your own exceptions that has
      * something to do with a GUI exception. A nifty feature of the
      * excpetion class is that it can tell you from which line and

diff --git a/include/guisan/widgets/textbox.hpp b/include/guisan/widgets/textbox.hpp
@@ -215,7 +215,7 @@ namespace gcn
          *
          * @param row The row to add.
          */
-        virtual void addRow(const std::string row);
+        virtual void addRow(const std::string& row);
 
         /**
          * Checks if the text box is opaque. An opaque text box will draw

diff --git a/include/guisan/widgets/textfield.hpp b/include/guisan/widgets/textfield.hpp
@@ -114,6 +114,23 @@ namespace gcn
          */
         void adjustHeight();
 
+        /**
+         * Checks if the text field is editable.
+         *
+         * @return True it the text field is editable, false otherwise.
+         * @see setEditable
+         */
+        bool isEditable() const { return mEditable; }
+
+        /**
+         * Sets the text field to be editable or not. A text field is editable
+         * by default.
+         *
+         * @param editable True if the text field should be editable, false
+         *                 otherwise.
+         */
+        void setEditable(bool editable) { mEditable = editable; }
+
         /**
          * Sets the caret position. As there is only one line of text
          * in a text field the position is the caret's x coordinate.
@@ -145,7 +162,6 @@ namespace gcn
         virtual void mousePressed(MouseEvent& mouseEvent);
 
         virtual void mouseDragged(MouseEvent& mouseEvent);
-
 
         // Inherited from KeyListener
 
@@ -184,6 +200,11 @@ namespace gcn
          * text needs to scroll in order to show the last type character.
          */
         int mXScroll;
+
+        /**
+         * True if the text field is editable, false otherwise.
+         */
+        bool mEditable;
     };
 }
 

diff --git a/src/widgets/textbox.cpp b/src/widgets/textbox.cpp
@@ -532,7 +532,7 @@ namespace gcn
         return mEditable;
     }
 
-    void TextBox::addRow(const std::string row)
+    void TextBox::addRow(const std::string& row)
     {
         mTextRows.push_back(row);
         adjustSize();

diff --git a/src/widgets/textfield.cpp b/src/widgets/textfield.cpp
@@ -67,7 +67,7 @@
 
 namespace gcn
 {
-    TextField::TextField()
+    TextField::TextField() : mEditable(true)
     {
         mCaretPosition = 0;
         mXScroll = 0;
@@ -79,7 +79,7 @@ namespace gcn
         adjustHeight();
     }
 
-    TextField::TextField(const std::string& text)
+    TextField::TextField(const std::string& text) : mEditable(true)
     {
         mCaretPosition = 0;
         mXScroll = 0;
@@ -128,7 +128,7 @@ namespace gcn
         graphics->setColor(getBackgroundColor());
         graphics->fillRectangle(Rectangle(0, 0, getWidth(), getHeight()));
 
-        if (isFocused())
+        if (isFocused() && isEditable())
         {
             drawCaret(graphics, getFont()->getWidth(mText.substr(0, mCaretPosition)) - mXScroll);
         }
@@ -183,12 +183,12 @@ namespace gcn
             ++mCaretPosition;
         }
 
-        else if (key.getValue() == Key::DELETE && mCaretPosition < mText.size())
+        else if (key.getValue() == Key::DELETE && mCaretPosition < mText.size() && mEditable)
         {
             mText.erase(mCaretPosition, 1);
         }
 
-        else if (key.getValue() == Key::BACKSPACE && mCaretPosition > 0)
+        else if (key.getValue() == Key::BACKSPACE && mCaretPosition > 0 && mEditable)
         {
             mText.erase(mCaretPosition - 1, 1);
             --mCaretPosition;
@@ -210,7 +210,7 @@ namespace gcn
         }
 
         else if (key.isCharacter() && key.getValue() != Key::TAB && !keyEvent.isAltPressed()
-                 && !keyEvent.isControlPressed())
+                 && !keyEvent.isControlPressed() && mEditable)
         {
             if (keyEvent.isShiftPressed() && key.isLetter())
             {