From aab223d60c9045ac98849ff13edf9c09cf5dbffb Mon Sep 17 00:00:00 2001 From: niushijia Date: Fri, 4 Jul 2025 09:25:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?add:=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E3=80=81=E5=B8=83=E5=B1=80=E5=88=87=E6=8D=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add:关闭按钮、布局切换按钮添加背景色 --- qml/VirtualKeyboard.qml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qml/VirtualKeyboard.qml b/qml/VirtualKeyboard.qml index dc0bab4..a62e109 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" -- Gitee From ca1b00d4aa9db62c187ffcde6e2cdcb40c6e2718 Mon Sep 17 00:00:00 2001 From: niushijia Date: Fri, 4 Jul 2025 09:25:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?add:=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=20?= =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E3=80=81=E8=83=8C=E6=99=AF=E8=89=B2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qml/HideButton.qml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/qml/HideButton.qml b/qml/HideButton.qml index fefddf6..5a5fcfc 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" } } } -- Gitee From 54de843ca48ab145469d79cdacd44d0f011afd09 Mon Sep 17 00:00:00 2001 From: niushijia Date: Fri, 4 Jul 2025 09:26:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?add:=E5=B8=83=E5=B1=80=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=8C=89=E9=92=AE=20=E5=B0=BA=E5=AF=B8=E3=80=81=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qml/PlacementModeButton.qml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/qml/PlacementModeButton.qml b/qml/PlacementModeButton.qml index 9100ada..e2a1b43 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 } } -- Gitee From 42e9e9f04714a23a4e408958bfc75fe8c5710998 Mon Sep 17 00:00:00 2001 From: niushijia Date: Fri, 4 Jul 2025 09:26:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?add:=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=80=81=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- img/close_hovered.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 img/close_hovered.svg diff --git a/img/close_hovered.svg b/img/close_hovered.svg new file mode 100644 index 0000000..1cccdf8 --- /dev/null +++ b/img/close_hovered.svg @@ -0,0 +1 @@ + \ No newline at end of file -- Gitee From 5224d181d0fb9b82acc888d9cd1507bbc1ff8026 Mon Sep 17 00:00:00 2001 From: niushijia Date: Fri, 4 Jul 2025 09:27:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?add:=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=80=81=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=B0qrc=E6=96=87=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qml.qrc | 1 + 1 file changed, 1 insertion(+) diff --git a/qml.qrc b/qml.qrc index ddb47b6..fdca6a9 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 -- Gitee