Index: sources/gui/qml/keyboard/style.qml =================================================================== diff -u -r33b33328479f58fa1d6bd16b569839b9bab8c27c -r3a23968a5d2584f5cd036402064284295c9d46a1 --- sources/gui/qml/keyboard/style.qml (.../style.qml) (revision 33b33328479f58fa1d6bd16b569839b9bab8c27c) +++ sources/gui/qml/keyboard/style.qml (.../style.qml) (revision 3a23968a5d2584f5cd036402064284295c9d46a1) @@ -30,6 +30,7 @@ import QtQuick 2.7 import QtQuick.VirtualKeyboard 2.1 import QtQuick.VirtualKeyboard.Styles 2.1 +import "qrc:/globals" KeyboardStyle { id: currentStyle @@ -51,30 +52,26 @@ inputLocaleIndicatorHighlightTimer.restart() } - keyboardDesignWidth: 2560 + keyboardDesignWidth: 800 keyboardDesignHeight: 800 - keyboardRelativeLeftMargin: 114 / keyboardDesignWidth - keyboardRelativeRightMargin: 114 / keyboardDesignWidth - keyboardRelativeTopMargin: 13 / keyboardDesignHeight - keyboardRelativeBottomMargin: 86 / keyboardDesignHeight keyboardBackground: Rectangle { - color: "black" + color: Colors.backgroundButtonSelectDark } keyPanel: KeyPanel { id: keyPanel Rectangle { id: keyBackground radius: 5 - color: "#383533" + color: Colors.backgroundRangeRect anchors.fill: keyPanel anchors.margins: keyBackgroundMargin Text { id: keySmallText text: control.smallText visible: control.smallTextVisible - color: "gray" + color: Colors.textMain anchors.right: parent.right anchors.top: parent.top anchors.margins: keyContentMargin / 3 @@ -88,7 +85,7 @@ Text { id: keyText text: control.displayText - color: "white" + color: Colors.textMain horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter anchors.fill: parent @@ -137,7 +134,7 @@ Rectangle { id: backspaceKeyBackground radius: 5 - color: "#23211E" + color: Colors.backgroundRangeRect anchors.fill: backspaceKeyPanel anchors.margins: keyBackgroundMargin Image { @@ -182,7 +179,7 @@ Rectangle { id: languageKeyBackground radius: 5 - color: "#35322f" + color: Colors.backgroundRangeRect anchors.fill: languageKeyPanel anchors.margins: keyBackgroundMargin Image { @@ -227,7 +224,7 @@ Rectangle { id: enterKeyBackground radius: 5 - color: "#1e1b18" + color: Colors.backgroundRangeRect anchors.fill: enterKeyPanel anchors.margins: keyBackgroundMargin Image { @@ -324,7 +321,7 @@ Rectangle { id: hideKeyBackground radius: 5 - color: "#1e1b18" + color: Colors.backgroundRangeRect anchors.fill: hideKeyPanel anchors.margins: keyBackgroundMargin Image {