From 37c26178be0e54dc42908b1cc5d7ec4802aff85b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 15 Mar 2021 10:50:14 +0900 Subject: Fixed behavior of caps for non-alpha characters, which was broken in commit 1865767. Signed-off-by: Michele Calgaro (cherry picked from commit 48c1053fa1e5896a10e576b9eb35634fa789cff4) --- src/VButton.cpp | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'src/VButton.cpp') 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) -- cgit v1.2.3