Remove commented out code

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>

diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml
index 82620a92006f0fc5ac4ff27b5a774c5f05056dfd..d6b40ed5b268e2d96d89171485bc171bd700f34c 100644 (file)
--- a/src/gui/UserStatusSelector.qml
+++ b/src/gui/UserStatusSelector.qml
@@ -24,10 +24,6 @@ ColumnLayout {
     spacing: 0
     property NC.UserStatusSelectorModel userStatusSelectorModel
 
-    FontMetrics {
-        id: metrics
-    }
-
     Text {
         Layout.topMargin: 16
         Layout.leftMargin: 8
@@ -108,8 +104,8 @@ ColumnLayout {
         Layout.fillWidth: true
 
         Button {
-            Layout.preferredWidth: userStatusMessageTextField.height // metrics.height * 2
-            Layout.preferredHeight: userStatusMessageTextField.height // metrics.height * 2
+            Layout.preferredWidth: userStatusMessageTextField.height 
+            Layout.preferredHeight: userStatusMessageTextField.height
             text: userStatusSelectorModel.userStatusEmoji
             onClicked: emojiDialog.open()
         }

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 24dc138eea0cdc7b0b939867afbeacc386f92c82..421132b557942d8d61ec8c21af0dafba399672b8 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -4,7 +4,7 @@ import QtQuick 2.15
 \r
 import com.nextcloud.desktopclient 1.0\r
 \r
-Item {\r
+QtObject {\r
     readonly property int pixelSize: fontMetrics.font.pixelSize\r
 \r
     // Colors\r
@@ -74,11 +74,9 @@ Item {
     readonly property string unifiedSearchResulTitleColor: "black"\r
     readonly property string unifiedSearchResulSublineColor: "grey"\r
 \r
+    readonly property var fontMetrics: FontMetrics {}\r
+\r
     function variableSize(size) {\r
         return size * (1 + Math.min(pixelSize / 100, 1));       \r
     }\r
-\r
-    FontMetrics {\r
-        id: fontMetrics\r
-    }\r
 }\r