gui: don't mix up display value with actual value
In the case of password entry, the two differ. Password entry was broken
by the earlier commit entitled "Improve input box text handling" because
it started using the displayValue as the actual value, even in cases where
they differ because of a mask value.
Change-Id: Iaf5a67e1d928f34595962a1f1b80eebb64e8b493
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 7913b36..84a9e5e 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -1000,7 +1000,7 @@
// Handles displaying the text properly when chars are added, deleted, or for scrolling
void HandleTextLocation(int x);
- void UpdateTextWidth();
+ void UpdateDisplayText();
void HandleCursorByTouch(int x);
void HandleCursorByText();
@@ -1010,15 +1010,14 @@
ImageResource* mBackground;
ImageResource* mCursor;
FontResource* mFont;
- std::string mText;
- std::string mLastValue;
std::string mVariable;
std::string mMask;
+ std::string mValue;
std::string displayValue;
COLOR mBackgroundColor;
COLOR mCursorColor;
int scrollingX;
- int cursorX;
+ int cursorX; // actual x axis location of the cursor
int lastX;
int mCursorLocation;
int mBackgroundX, mBackgroundY, mBackgroundW, mBackgroundH;