Reworked ctrl key

maliit · Nov 5, 2024 · 1c50e6d · 1c50e6d
1 parent 5106a55
commit 1c50e6d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/qml/keys/ControlKey.qml b/qml/keys/ControlKey.qml
@@ -21,22 +21,27 @@ import QtQuick.Window 2.12
 import MaliitKeyboard 2.0
 
 ActionKey {
+
+    label: "ctrl"
+    shifted: "ctrl"
+    action: "ctrl"
+
+    switchBackFromSymbols: true
     overridePressArea: true
 
     Rectangle {
         anchors.margins: 8
         anchors.fill: parent
         color: "#888888"
         radius: 8 / Screen.devicePixelRatio
-        opacity: panel.activeKeypadState == "CONTROL" ? 0.0 : 0.25
+        opacity: panel.activeKeypadState == "CONTROL" ? 0.25 : 0.0
     }
 
     Label {
         anchors.centerIn: parent
         font.weight: Font.Light
         opacity: 0.6
         font.pixelSize: parent.fontSize * 0.6
-        text: "ctrl"
         horizontalAlignment: Text.AlignHCenter
     }
 

diff --git a/src/view/abstracttexteditor.cpp b/src/view/abstracttexteditor.cpp
@@ -1203,7 +1203,7 @@ void AbstractTextEditor::sendKeySequence(const QString &action, const QKeySequen
         const int key = actionSequence[i] & ~AllModifiers;
         const int modifiers = actionSequence[i] & AllModifiers;
         QString text("");
-        if (modifiers == Qt::NoModifier || modifiers == Qt::ShiftModifier) {
+        if (modifiers == Qt::NoModifier || modifiers == Qt::ShiftModifier || modifiers == Qt::ControlModifier) {
             text = QString(key);
         }
         sendKeyPressAndReleaseEvents(key, static_cast<Qt::KeyboardModifiers>(modifiers), text);