From bec4833bedc89ce694d208436de456499de7ad6f Mon Sep 17 00:00:00 2001
From: cutefishd <cutefishos@foxmail.com>
Date: Fri, 23 Apr 2021 22:12:18 +0800
Subject: [PATCH] Fix left item width

---
 images/light/battery-level-10-charging-symbolic.svg  | 5 +++--
 images/light/battery-level-10-symbolic.svg           | 5 +++--
 images/light/battery-level-100-charging-symbolic.svg | 2 +-
 images/light/battery-level-100-symbolic.svg          | 4 ++--
 images/light/battery-level-20-charging-symbolic.svg  | 2 +-
 images/light/battery-level-20-symbolic.svg           | 2 +-
 images/light/battery-level-30-charging-symbolic.svg  | 5 +++--
 images/light/battery-level-30-symbolic.svg           | 2 +-
 images/light/battery-level-40-charging-symbolic.svg  | 5 +++--
 images/light/battery-level-40-symbolic.svg           | 2 +-
 images/light/battery-level-50-charging-symbolic.svg  | 5 +++--
 images/light/battery-level-50-symbolic.svg           | 7 ++++---
 images/light/battery-level-60-charging-symbolic.svg  | 2 +-
 images/light/battery-level-60-symbolic.svg           | 2 +-
 images/light/battery-level-70-charging-symbolic.svg  | 2 +-
 images/light/battery-level-70-symbolic.svg           | 2 +-
 images/light/battery-level-80-charging-symbolic.svg  | 5 +++--
 images/light/battery-level-80-symbolic.svg           | 5 +++--
 images/light/battery-level-90-charging-symbolic.svg  | 5 +++--
 images/light/battery-level-90-symbolic.svg           | 2 +-
 qml/main.qml                                         | 5 ++++-
 21 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/images/light/battery-level-10-charging-symbolic.svg b/images/light/battery-level-10-charging-symbolic.svg
index b2e1572..5a5e2b3 100644
--- a/images/light/battery-level-10-charging-symbolic.svg
+++ b/images/light/battery-level-10-charging-symbolic.svg
@@ -46,11 +46,12 @@
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg14" />
+     inkscape:current-layer="svg14"
+     inkscape:document-rotation="0" />
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-10-symbolic.svg b/images/light/battery-level-10-symbolic.svg
index 9f000ab..bb0c79b 100644
--- a/images/light/battery-level-10-symbolic.svg
+++ b/images/light/battery-level-10-symbolic.svg
@@ -46,11 +46,12 @@
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg12" />
+     inkscape:current-layer="svg12"
+     inkscape:document-rotation="0" />
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-100-charging-symbolic.svg b/images/light/battery-level-100-charging-symbolic.svg
index 5d074fd..1fcae8d 100644
--- a/images/light/battery-level-100-charging-symbolic.svg
+++ b/images/light/battery-level-100-charging-symbolic.svg
@@ -51,7 +51,7 @@
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-100-symbolic.svg b/images/light/battery-level-100-symbolic.svg
index 702f5cb..6767ebc 100644
--- a/images/light/battery-level-100-symbolic.svg
+++ b/images/light/battery-level-100-symbolic.svg
@@ -42,7 +42,7 @@
      showgrid="false"
      inkscape:zoom="64.965436"
      inkscape:cx="10.492294"
-     inkscape:cy="9.0585588"
+     inkscape:cy="10.289983"
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
@@ -51,7 +51,7 @@
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-20-charging-symbolic.svg b/images/light/battery-level-20-charging-symbolic.svg
index 039d990..d55e8cc 100644
--- a/images/light/battery-level-20-charging-symbolic.svg
+++ b/images/light/battery-level-20-charging-symbolic.svg
@@ -51,7 +51,7 @@
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-20-symbolic.svg b/images/light/battery-level-20-symbolic.svg
index f4827d0..c291578 100644
--- a/images/light/battery-level-20-symbolic.svg
+++ b/images/light/battery-level-20-symbolic.svg
@@ -51,7 +51,7 @@
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-30-charging-symbolic.svg b/images/light/battery-level-30-charging-symbolic.svg
index 70e0ffc..bca7d05 100644
--- a/images/light/battery-level-30-charging-symbolic.svg
+++ b/images/light/battery-level-30-charging-symbolic.svg
@@ -45,9 +45,10 @@
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg14" />
+     inkscape:current-layer="svg14"
+     inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-30-symbolic.svg b/images/light/battery-level-30-symbolic.svg
index 89d6299..2883683 100644
--- a/images/light/battery-level-30-symbolic.svg
+++ b/images/light/battery-level-30-symbolic.svg
@@ -48,7 +48,7 @@
      inkscape:current-layer="svg10"
      inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-40-charging-symbolic.svg b/images/light/battery-level-40-charging-symbolic.svg
index d801e8a..5447a15 100644
--- a/images/light/battery-level-40-charging-symbolic.svg
+++ b/images/light/battery-level-40-charging-symbolic.svg
@@ -45,9 +45,10 @@
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg14" />
+     inkscape:current-layer="svg14"
+     inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-40-symbolic.svg b/images/light/battery-level-40-symbolic.svg
index 8588ba7..ca569fa 100644
--- a/images/light/battery-level-40-symbolic.svg
+++ b/images/light/battery-level-40-symbolic.svg
@@ -48,7 +48,7 @@
      inkscape:current-layer="svg10"
      inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-50-charging-symbolic.svg b/images/light/battery-level-50-charging-symbolic.svg
index debb68f..5d43c55 100644
--- a/images/light/battery-level-50-charging-symbolic.svg
+++ b/images/light/battery-level-50-charging-symbolic.svg
@@ -45,9 +45,10 @@
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg14" />
+     inkscape:current-layer="svg14"
+     inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-50-symbolic.svg b/images/light/battery-level-50-symbolic.svg
index 1e9448c..8b846a8 100644
--- a/images/light/battery-level-50-symbolic.svg
+++ b/images/light/battery-level-50-symbolic.svg
@@ -41,13 +41,14 @@
      showgrid="false"
      inkscape:zoom="45.9375"
      inkscape:cx="11"
-     inkscape:cy="8"
+     inkscape:cy="9.7414966"
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg10" />
+     inkscape:current-layer="svg10"
+     inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-60-charging-symbolic.svg b/images/light/battery-level-60-charging-symbolic.svg
index dfcea26..e140fa9 100644
--- a/images/light/battery-level-60-charging-symbolic.svg
+++ b/images/light/battery-level-60-charging-symbolic.svg
@@ -48,7 +48,7 @@
      inkscape:current-layer="svg14"
      inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-60-symbolic.svg b/images/light/battery-level-60-symbolic.svg
index 36ed0b5..c8c2dd4 100644
--- a/images/light/battery-level-60-symbolic.svg
+++ b/images/light/battery-level-60-symbolic.svg
@@ -48,7 +48,7 @@
      inkscape:current-layer="svg10"
      inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-70-charging-symbolic.svg b/images/light/battery-level-70-charging-symbolic.svg
index 6f18ffd..fdc397d 100644
--- a/images/light/battery-level-70-charging-symbolic.svg
+++ b/images/light/battery-level-70-charging-symbolic.svg
@@ -48,7 +48,7 @@
      inkscape:current-layer="svg14"
      inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-70-symbolic.svg b/images/light/battery-level-70-symbolic.svg
index eb08dd5..f434d32 100644
--- a/images/light/battery-level-70-symbolic.svg
+++ b/images/light/battery-level-70-symbolic.svg
@@ -48,7 +48,7 @@
      inkscape:current-layer="svg10"
      inkscape:document-rotation="0" />
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-80-charging-symbolic.svg b/images/light/battery-level-80-charging-symbolic.svg
index e1160fe..aa8dff5 100644
--- a/images/light/battery-level-80-charging-symbolic.svg
+++ b/images/light/battery-level-80-charging-symbolic.svg
@@ -46,11 +46,12 @@
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg16" />
+     inkscape:current-layer="svg16"
+     inkscape:document-rotation="0" />
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-80-symbolic.svg b/images/light/battery-level-80-symbolic.svg
index 5e45261..779e904 100644
--- a/images/light/battery-level-80-symbolic.svg
+++ b/images/light/battery-level-80-symbolic.svg
@@ -46,11 +46,12 @@
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg12" />
+     inkscape:current-layer="svg12"
+     inkscape:document-rotation="0" />
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-90-charging-symbolic.svg b/images/light/battery-level-90-charging-symbolic.svg
index 2920722..be1b40d 100644
--- a/images/light/battery-level-90-charging-symbolic.svg
+++ b/images/light/battery-level-90-charging-symbolic.svg
@@ -46,11 +46,12 @@
      inkscape:window-x="0"
      inkscape:window-y="40"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg16" />
+     inkscape:current-layer="svg16"
+     inkscape:document-rotation="0" />
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/images/light/battery-level-90-symbolic.svg b/images/light/battery-level-90-symbolic.svg
index 2ba9c35..409a9d1 100644
--- a/images/light/battery-level-90-symbolic.svg
+++ b/images/light/battery-level-90-symbolic.svg
@@ -51,7 +51,7 @@
   <title
      id="title2">Paper Symbolic Icon Theme</title>
   <rect
-     style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke-width:1.11904"
      id="rect843"
      width="15.355352"
      height="8.3758783"
diff --git a/qml/main.qml b/qml/main.qml
index 07286f4..924d73f 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -50,7 +50,8 @@ Item {
         StandardItem {
             id: acticityItem
             Layout.fillHeight: true
-            Layout.preferredWidth: acticityLayout.implicitWidth ? acticityLayout.implicitWidth + FishUI.Units.largeSpacing
+            Layout.preferredWidth: acticityLayout.implicitWidth ? Math.min(acticityLayout.implicitWidth + FishUI.Units.largeSpacing,
+                                                                           rootItem.width / 2)
                                                                 : 0
             onClicked: acticityMenu.open()
 
@@ -74,6 +75,8 @@ Item {
                 Label {
                     id: acticityLabel
                     text: acticity.title
+                    Layout.fillWidth: true
+                    elide: Qt.ElideRight
                     color: FishUI.Theme.darkMode ? 'white' : 'black'
                     visible: text
                     Layout.alignment: Qt.AlignVCenter