summaryrefslogtreecommitdiffstats
path: root/src/MainWidget.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2021-03-15 10:50:14 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2021-03-15 10:52:47 +0900
commit48c1053fa1e5896a10e576b9eb35634fa789cff4 (patch)
treed2686a57f2c353fce0f5352f0b295018031c19b4 /src/MainWidget.cpp
parent568e7737c7b589e65b9f39a5d7a3edab791177b0 (diff)
downloadkvkbd-48c1053fa1e5896a10e576b9eb35634fa789cff4.tar.gz
kvkbd-48c1053fa1e5896a10e576b9eb35634fa789cff4.zip
Fixed behavior of caps for non-alpha characters, which was broken in
commit 00e207e. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/MainWidget.cpp')
-rw-r--r--src/MainWidget.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/MainWidget.cpp b/src/MainWidget.cpp
index 8797085..ff10c27 100644
--- a/src/MainWidget.cpp
+++ b/src/MainWidget.cpp
@@ -858,16 +858,17 @@ void MainWidget::updateNumlock()
void MainWidget::toggleShift(unsigned int keycode)
{
send_key(keycode);
- updateShift();
+ updateShiftCaps();
}
-void MainWidget::updateShift()
+void MainWidget::updateShiftCaps()
{
- bool state = caps->isOn() ^ (lshift->isOn() || rshift->isOn());
+ bool shiftState = lshift->isOn() || rshift->isOn();
+ bool capsState = caps->isOn();
for (unsigned a = 0; a < btns.size(); a++)
{
VButton *v = btns[a];
- v->shiftPressed(state);
+ v->shiftCapsPressed(shiftState, capsState);
}
}
@@ -880,7 +881,7 @@ void MainWidget::keyPress ( unsigned int a )
mod->setOn(false);
}
// Make sure the key labels are correctly updated
- updateShift();
+ updateShiftCaps();
}
void MainWidget::send_key(unsigned int keycode)
@@ -935,7 +936,7 @@ void MainWidget::queryModState()
if (caps_state != caps->isOn())
{
caps->setOn(caps_state);
- updateShift();
+ updateShiftCaps();
}
bool numl_state = keyState(XK_Num_Lock);