Fixed behavior of caps for non-alpha characters, which was broken in

commit 00e207e.

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 23 insertions, 6 deletions

diff --git a/src/VButton.cpp b/src/VButton.cpp
index cabedd1..c949612 100644
--- a/src/VButton.cpp
+++ b/src/VButton.cpp
@@ -21,27 +21,44 @@ VButton::~VButton()
 {
 }
 
-void VButton::shiftPressed(bool press)
+void VButton::shiftCapsPressed(bool shift, bool caps)
 {
-	if (press)
+	if (isAlpha)
 	{
-		TQPushButton::setText(u);
+		// Alpha button, both shift and caps affect its state
+		if (shift ^ caps)
+		{
+			TQPushButton::setText(shiftText);
+		}
+		else
+		{
+			TQPushButton::setText(lowerText);
+		}
 	}
 	else
 	{
-		TQPushButton::setText(l);
+		// Non alpha button, only shift affects its state
+		if (shift)
+		{
+			TQPushButton::setText(shiftText);
+		}
+		else
+		{
+			TQPushButton::setText(lowerText);
+		}
 	}
 }
 
 void VButton::setText(const TQString& text)
 {
 	TQPushButton::setText(text);
-	l=text;
+	lowerText = text;
+	isAlpha = text.length() == 1 && (text.upper() != text);
 }
 
 void VButton::setShiftText(const TQString& text)
 {
-	u=text;
+	shiftText=text;
 }
 
 void VButton::setColor(const TQColor &color)