From: Felix Weilbach <felix.weilbach@nextcloud.com>
Date: Tue, 19 Oct 2021 11:33:32 +0000 (+0200)
Subject: Remove commented out code
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~17^2~189^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f4bf4da44d7a020044eb8576a1096fafa028cc85;p=nextcloud-desktop.git

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 82620a920..d6b40ed5b 100644
--- 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 24dc138ee..421132b55 100644
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -4,7 +4,7 @@ import QtQuick 2.15
 
 import com.nextcloud.desktopclient 1.0
 
-Item {
+QtObject {
     readonly property int pixelSize: fontMetrics.font.pixelSize
 
     // Colors
@@ -74,11 +74,9 @@ Item {
     readonly property string unifiedSearchResulTitleColor: "black"
     readonly property string unifiedSearchResulSublineColor: "grey"
 
+    readonly property var fontMetrics: FontMetrics {}
+
     function variableSize(size) {
         return size * (1 + Math.min(pixelSize / 100, 1));       
     }
-
-    FontMetrics {
-        id: fontMetrics
-    }
 }