summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-06-06 16:29:22 +0300
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-06-07 04:16:47 +0000
commit0eec127f81eb35ed1cc5171c9a82b7f9c4525324 (patch)
tree4e676e785e32417e7109aad5fcf1b4133f0bc076
parent0de1d1ba224d1f51a01b7870e31e5b032996d9f7 (diff)
Remove ignoreHotkeys property from some control types
QML Sliders and combo boxes were really only ignoring hotkeys because of arrow keys can be used to adjust them. However, arrows are no longer used as global hotkeys since the nudge functionality has been removed. It's unclear why QML toolbuttons were ever ignoring the hotkeys - only key they seem to be responding to is space, and that still works even if ignoreHotkeys is removed. Perhaps it worked differently in Qt versions prior 5.11. Task-number: QT3DS-445 Change-Id: I19d74a792d593355684f6794f377dc4c826d4733 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml2
-rw-r--r--src/Authoring/Studio/Palettes/controls/StyledComboBox.qml2
-rw-r--r--src/Authoring/Studio/Palettes/controls/StyledToolButton.qml1
3 files changed, 0 insertions, 5 deletions
diff --git a/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml
index 853ed438..96df8c43 100644
--- a/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml
+++ b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml
@@ -78,8 +78,6 @@ Row {
Slider {
id: slider
- property bool ignoreHotkeys: true
-
leftPadding: 0
background: Rectangle {
diff --git a/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml b/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml
index f9afde69..d3140744 100644
--- a/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml
+++ b/src/Authoring/Studio/Palettes/controls/StyledComboBox.qml
@@ -34,8 +34,6 @@ import QtQuick.Window 2.2
ComboBox {
id: control
- property bool ignoreHotkeys: true
-
Layout.preferredHeight: _controlBaseHeight
Layout.preferredWidth: _valueWidth
topPadding: 0
diff --git a/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml b/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml
index eb6d9749..d1beea28 100644
--- a/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml
+++ b/src/Authoring/Studio/Palettes/controls/StyledToolButton.qml
@@ -35,7 +35,6 @@ ToolButton {
property string enabledImage
property string disabledImage
property alias toolTipText: toolTip.text
- property bool ignoreHotkeys: true
hoverEnabled: true