From 50e26f8676f2f45aed747b97a915a46a6f0a7e1f Mon Sep 17 00:00:00 2001
From: qiqi <qiqi@kylinos.cn>
Date: Thu, 20 Apr 2023 09:44:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8F=B3=E4=BE=A7=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E8=B7=9F=E9=9A=8F=E9=AB=98=E4=BA=AE=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=B8=83=E5=B1=80=EF=BC=9B=E6=B7=BB=E5=8A=A0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8C=89=E9=92=AE=E5=8F=8D=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../translations/recent-file-extension_zh_CN.ts    |  2 +-
 qml/AppUI/FullScreenContent.qml                    |  1 -
 qml/AppUI/PluginSelectMenu.qml                     |  2 ++
 qml/AppUI/Sidebar.qml                              | 14 +++++++++-----
 translations/ukui-menu_zh_CN.ts                    |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/extension/recent-file/translations/recent-file-extension_zh_CN.ts b/extension/recent-file/translations/recent-file-extension_zh_CN.ts
index e17d0fe..c075f44 100644
--- a/extension/recent-file/translations/recent-file-extension_zh_CN.ts
+++ b/extension/recent-file/translations/recent-file-extension_zh_CN.ts
@@ -5,7 +5,7 @@
     <name>UkuiMenu::RecentFileExtension</name>
     <message>
         <source>Recent Files</source>
-        <translation type="unfinished"></translation>
+        <translation>最近</translation>
     </message>
     <message>
         <source>Open</source>
diff --git a/qml/AppUI/FullScreenContent.qml b/qml/AppUI/FullScreenContent.qml
index f61109f..649b4d8 100644
--- a/qml/AppUI/FullScreenContent.qml
+++ b/qml/AppUI/FullScreenContent.qml
@@ -74,7 +74,6 @@ RowLayout {
             width: parent.width
             height: contentHeight > parent.height ? parent.height : contentHeight
             interactive: contentHeight > parent.height
-            spacing: 5
 
             highlightMoveDuration: animationDuration
             highlight: AppControls2.StyleBackground {
diff --git a/qml/AppUI/PluginSelectMenu.qml b/qml/AppUI/PluginSelectMenu.qml
index 2377be2..9f1df14 100644
--- a/qml/AppUI/PluginSelectMenu.qml
+++ b/qml/AppUI/PluginSelectMenu.qml
@@ -35,6 +35,8 @@ RowLayout {
         Layout.fillWidth: true
         Layout.maximumWidth: height
 
+        highlight: mainWindow.isFullScreen
+        autoHighLight: !mainWindow.isFullScreen
         buttonIcon: "image://appicon/ukui-selected"
         onClicked: pluginSelectMenuRoot.model.autoSwitchProvider();
     }
diff --git a/qml/AppUI/Sidebar.qml b/qml/AppUI/Sidebar.qml
index 61c4ae5..050d455 100644
--- a/qml/AppUI/Sidebar.qml
+++ b/qml/AppUI/Sidebar.qml
@@ -35,12 +35,15 @@ Item {
             Layout.fillWidth: true
             Layout.preferredHeight: 40
             Layout.rightMargin: 12
+            Layout.leftMargin: 16
 
             ListView {
                 id: extensionListView
                 width: parent.width - 34
                 height: parent.height
                 clip: true
+                spacing: 24
+                interactive: false
                 orientation: ListView.Horizontal
                 model: extensionManager.extensionModel()
                 delegate: headerDelegate
@@ -147,7 +150,7 @@ Item {
 
         Item {
             property var extensionData: model.data
-            width: 100
+            width: styleText.width
             height: ListView.view ? ListView.view.height : 0
 
             onExtensionDataChanged: {
@@ -162,14 +165,15 @@ Item {
                 }
             }
 
-            Text {
-                anchors.fill: parent
+            AppControls2.StyleText {
+                height: parent.height
+                id: styleText
                 verticalAlignment: Text.AlignVCenter
                 horizontalAlignment: Text.AlignHCenter
-                font.bold: true
+                font.bold: parent.ListView.isCurrentItem
                 wrapMode: Text.ElideRight
 
-                color: parent.ListView.isCurrentItem ? "blue" : "black"
+                paletteRole: parent.ListView.isCurrentItem ? Palette.Highlight: Palette.Text
                 text: model.name
             }
 
diff --git a/translations/ukui-menu_zh_CN.ts b/translations/ukui-menu_zh_CN.ts
index 1d91cf0..6bf9f0b 100644
--- a/translations/ukui-menu_zh_CN.ts
+++ b/translations/ukui-menu_zh_CN.ts
@@ -189,7 +189,7 @@
     <name>UkuiMenu::FavoriteExtension</name>
     <message>
         <source>Favorite</source>
-        <translation>收藏夹</translation>
+        <translation>收藏</translation>
     </message>
 </context>
 <context>