diff --git a/img/close_hovered.svg b/img/close_hovered.svg new file mode 100644 index 0000000000000000000000000000000000000000..1cccdf877e6b03d778b30f82c23cd9a1f865a3b3 --- /dev/null +++ b/img/close_hovered.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/qml.qrc b/qml.qrc index ddb47b6b37a90c8f51f2f6e7974641e54e00eb2f..fdca6a9b2369f2eb77f7e04132e4a905587b41d2 100644 --- a/qml.qrc +++ b/qml.qrc @@ -43,5 +43,6 @@ img/down.svg img/extend.svg qml/js/keycode.js + img/close_hovered.svg diff --git a/qml/HideButton.qml b/qml/HideButton.qml index fefddf6e45723e4cb9805ce8a65ed6180b90542c..5a5fcfcba7698cf4f1ff3120a6daa1ea8cfeff0a 100644 --- a/qml/HideButton.qml +++ b/qml/HideButton.qml @@ -19,17 +19,18 @@ import QtQuick 2.0 import QtQuick.Controls 2.0 Rectangle { - height: virtualKeyboard.toolbarSize - width: virtualKeyboard.toolbarSize + height: virtualKeyboard.toolButtonSize + width: virtualKeyboard.toolButtonSize anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: virtualKeyboard.cardinalNumber * 3.5 color: virtualKeyboard.virtualKeyboardColor + radius: virtualKeyboard.toolButtonRadius Image { id: hideButtonImg anchors.centerIn: parent - sourceSize: Qt.size(parent.width, parent.width) + sourceSize: Qt.size(parent.width * 0.5, parent.width * 0.5) source: "qrc:/img/close.svg" } @@ -44,19 +45,24 @@ Rectangle { hoverEnabled: true onPressed: { - hideButtonImg.source = "qrc:/img/close_pressed.svg" + color = virtualKeyboard.hideButtonPressedColor } onReleased: { virtualKeyboard.hideVirtualKeyboard() + color = virtualKeyboard.hideButtonHoverColor } onEntered: { hideButtonToolTip.visible = true + color = virtualKeyboard.hideButtonHoverColor + hideButtonImg.source = "qrc:/img/close_hovered.svg" } onExited: { hideButtonToolTip.visible = false + color = virtualKeyboard.virtualKeyboardColor + hideButtonImg.source = "qrc:/img/close.svg" } } } diff --git a/qml/PlacementModeButton.qml b/qml/PlacementModeButton.qml index 9100adaf10a1a42efdaa3220df53c02fda605df1..e2a1b4348db2e119e6c58b85e714a420c0356288 100644 --- a/qml/PlacementModeButton.qml +++ b/qml/PlacementModeButton.qml @@ -19,8 +19,8 @@ import QtQuick 2.0 import QtQuick.Controls 2.0 Rectangle { - height: virtualKeyboard.toolbarSize - width: virtualKeyboard.toolbarSize + height: virtualKeyboard.toolButtonSize + width: virtualKeyboard.toolButtonSize property var alignmentRight @@ -28,9 +28,11 @@ Rectangle { anchors.right: alignmentRight.left anchors.rightMargin: virtualKeyboard.cardinalNumber * 3.5 color: virtualKeyboard.virtualKeyboardColor + radius: virtualKeyboard.toolButtonRadius + Image { id: placementModelButtonImg - sourceSize: Qt.size(parent.width, parent.width) + sourceSize: Qt.size(parent.width * 0.5, parent.width * 0.5) source: "qrc:/img/upfloat.svg" anchors.centerIn: parent } @@ -48,10 +50,20 @@ Rectangle { onEntered: { placementModelButtonToolTip.visible = true + color = virtualKeyboard.placementButtonHoverColor } onExited: { placementModelButtonToolTip.visible = false + color = virtualKeyboard.virtualKeyboardColor + } + + onPressed: { + color = virtualKeyboard.placementButtonPressedColor + } + + onReleased: { + color = virtualKeyboard.placementButtonHoverColor } } diff --git a/qml/VirtualKeyboard.qml b/qml/VirtualKeyboard.qml index dc0bab490f4a7a36007dbae5d1b51fb5376ca802..a62e109765b15f02ab71494c65625282cf6a6b36 100644 --- a/qml/VirtualKeyboard.qml +++ b/qml/VirtualKeyboard.qml @@ -68,6 +68,7 @@ Rectangle { property int preeditX: cardinalNumber * 3.5 property int candidateListWidth: virtualKeyboardContent.width - 7*cardinalNumber property int toolbarSize: cardinalNumber * 3 + property int toolButtonSize: cardinalNumber * 6 /*关闭按钮尺寸调大*/ property int candidateListX: cardinalNumber * 2 property int candidateListSpacing: cardinalNumber * 3 property int keyRadius: cardinalNumber @@ -107,9 +108,15 @@ Rectangle { property color preeditBottomColor: "#E4E6E9" /*预编辑下方分割线颜色*/ property color dragBarIndicatorColor: "#1D1D1D" /*拖拽条指示器颜色*/ + property color hideButtonPressedColor: "#C43232" /*关闭按钮按下态颜色*/ + property color hideButtonHoverColor: "#E93C3C" /*关闭按钮悬浮态颜色*/ + property color placementButtonPressedColor: "#C8C8C8" /*布局模式切换按钮按下态颜色*/ + property color placementButtonHoverColor: "#DCDCDC" /*布局模式切换按钮悬浮态颜色*/ + //圆角相关 property int virtualKeyboardFloatPlacementRadius: 16 property int dragBarIndicatorRadius: 2 + property int toolButtonRadius: 8 //状态相关 property string letterState: "NORMAL"