From c1e407ff30acd628dcbba36caeb5015c4c820d93 Mon Sep 17 00:00:00 2001
From: hantengc <hanteng@kylinos.cn>
Date: Wed, 9 Aug 2023 16:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=99=9A=E6=8B=9F=E9=94=AE?=
 =?UTF-8?q?=E7=9B=98UI=E7=95=8C=E9=9D=A2=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qml/CandidateList.qml           |  2 +-
 qml/ClassicKeyboardLayout.qml   |  2 +-
 qml/DragBar.qml                 |  3 +--
 qml/KeyboardLayoutArea.qml      |  9 +++++---
 qml/Preedit.qml                 |  3 +--
 qml/Separator.qml               |  3 +--
 qml/ToolbarAndCandidateArea.qml |  3 +--
 qml/VirtualKeyboard.qml         | 40 +++++++++++++++++++++++++--------
 8 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/qml/CandidateList.qml b/qml/CandidateList.qml
index 6023a9a..aa297f6 100644
--- a/qml/CandidateList.qml
+++ b/qml/CandidateList.qml
@@ -19,7 +19,7 @@ import QtQuick 2.0
 import QtQuick.Controls 2.0
 
 Rectangle {
-    width: virtualKeyboard.width
+    width: parent.width
     height: virtualKeyboard.toolAndCandidateHeight
     color: virtualKeyboard.virtualKeyboardColor
     visible: !virtualKeyboard.isToolbarVisible
diff --git a/qml/ClassicKeyboardLayout.qml b/qml/ClassicKeyboardLayout.qml
index cd868b2..35f001a 100644
--- a/qml/ClassicKeyboardLayout.qml
+++ b/qml/ClassicKeyboardLayout.qml
@@ -19,7 +19,7 @@ import QtQuick 2.0
 import "key/"
 
 Column {
-    width: virtualKeyboard.width
+    width: parent.width
     spacing: virtualKeyboard.keySpacing
     visible: virtualKeyboard.layout == "classic" ? true : false
 
diff --git a/qml/DragBar.qml b/qml/DragBar.qml
index 0397a2d..3430083 100644
--- a/qml/DragBar.qml
+++ b/qml/DragBar.qml
@@ -18,8 +18,7 @@
 import QtQuick 2.0
 
 Rectangle {
-    id: dragBar
-    width: virtualKeyboard.width
+    width: parent.width
     height: virtualKeyboard.dragBarHeight
     color: virtualKeyboard.virtualKeyboardColor
     radius: virtualKeyboard.virtualKeyboardFloatPlacementRadius
diff --git a/qml/KeyboardLayoutArea.qml b/qml/KeyboardLayoutArea.qml
index 2b044eb..49bbe67 100644
--- a/qml/KeyboardLayoutArea.qml
+++ b/qml/KeyboardLayoutArea.qml
@@ -19,11 +19,14 @@ import QtQuick 2.0
 import QtQuick.Window 2.0
 
 Rectangle {
-    width: virtualKeyboard.width
+    visible: isKeyBoardLayoutVisible
+
+    width: parent.width
     height: virtualKeyboard.keyboardLayoutHeight
-    anchors.top: toolbarAndCandidate.bottom
-    anchors.topMargin: keySpacing * 2
+    radius: virtualKeyboard.radius
     color: virtualKeyboard.virtualKeyboardColor
 
+    anchors.topMargin: keySpacing * 2
+
     ClassicKeyboardLayout{}
 }
diff --git a/qml/Preedit.qml b/qml/Preedit.qml
index d59493e..20a4923 100644
--- a/qml/Preedit.qml
+++ b/qml/Preedit.qml
@@ -19,11 +19,10 @@ import QtQuick 2.0
 import QtQuick.Controls 2.0
 
 Rectangle {
-    width: virtualKeyboard.width
+    width: parent.width
     height: virtualKeyboard.preeditHeight
     color: virtualKeyboard.virtualKeyboardColor
     x: virtualKeyboard.preeditX
-    anchors.top: dragBar.visible ? dragBar.bottom : parent.top
 
     Label {
         font.pointSize: virtualKeyboard.preeditTextFontSize
diff --git a/qml/Separator.qml b/qml/Separator.qml
index 43bbfae..57b241d 100644
--- a/qml/Separator.qml
+++ b/qml/Separator.qml
@@ -19,8 +19,7 @@ import QtQuick 2.0
 import QtQuick.Controls 2.0
 
 Rectangle {
-        anchors.top: preedit.bottom
-        width: virtualKeyboard.width
+        width: parent.width
         height: 1
         color: virtualKeyboard.preeditBottomColor
 }
\ No newline at end of file
diff --git a/qml/ToolbarAndCandidateArea.qml b/qml/ToolbarAndCandidateArea.qml
index 7b4372f..8e7db91 100644
--- a/qml/ToolbarAndCandidateArea.qml
+++ b/qml/ToolbarAndCandidateArea.qml
@@ -18,9 +18,8 @@
 import QtQuick 2.0
 
 Rectangle {
-    width: virtualKeyboard.width
+    width: parent.width
     height: virtualKeyboard.toolAndCandidateHeight
-    anchors.top: preedit.bottom
     color: virtualKeyboard.virtualKeyboardColor
     Toolbar{}
     CandidateList{}
diff --git a/qml/VirtualKeyboard.qml b/qml/VirtualKeyboard.qml
index 65746b8..7fceabf 100644
--- a/qml/VirtualKeyboard.qml
+++ b/qml/VirtualKeyboard.qml
@@ -253,16 +253,38 @@ Rectangle {
         }
     }
 
-    DragBar{id: dragBar}
-    Preedit{id: preedit}
-    ToolbarAndCandidateArea{id: toolbarAndCandidate}
-    KeyboardLayoutArea{
-        visible: isKeyBoardLayoutVisible
-        anchors.bottom: virtualKeyboard.bottom
+    Rectangle {
+        id: virtualKeyboardComponent
+        color: virtualKeyboard.virtualKeyboardColor
         radius: virtualKeyboard.radius
-    }
 
-    Separator{
-        id: separator
+        width: parent.width
+        height: parent.height
+        
+        DragBar {
+            id: dragBar
+            anchors.top: parent.top
+        }
+
+        Preedit {
+            id: preedit
+            anchors.top: dragBar.visible ? dragBar.bottom : parent.top
+        }
+
+        Separator {
+            id: separator
+            anchors.top: preedit.bottom
+        }
+        
+        ToolbarAndCandidateArea {
+            id: toolbarAndCandidate
+            anchors.top: separator.bottom
+        }
+        
+        KeyboardLayoutArea {
+            id: keyboardLayoutArea
+            anchors.bottom: virtualKeyboardComponent.bottom
+        }
+        
     }
 }