]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Fix search bar separator in tray window
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Tue, 19 Nov 2024 02:25:27 +0000 (10:25 +0800)
committerClaudio Cambra <claudio.cambra@nextcloud.com>
Thu, 21 Nov 2024 05:21:00 +0000 (13:21 +0800)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
src/gui/tray/MainWindow.qml

index 83565fb5298c70584d4d5ab068efecfb3ef4dcb7..6b90cae4bbfb1793cc9f7f6c857c7931a157a593 100644 (file)
@@ -593,26 +593,26 @@ ApplicationWindow {
             isSearchInProgress: UserModel.currentUser.unifiedSearchResultsListModel.isSearchInProgress\r
             onTextEdited: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = trayWindowUnifiedSearchInputContainer.text }\r
             onClearText: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = "" }\r
+        }\r
 \r
-            // TODO: consult designers, this line looks weird atm\r
-            // Rectangle {\r
-            //     id: bottomUnifiedSearchInputSeparator\r
+        Rectangle {\r
+            id: bottomUnifiedSearchInputSeparator\r
 \r
-            //     anchors.left: parent.left\r
-            //     anchors.right: parent.right\r
-            //     anchors.bottom: parent.bottom\r
+            anchors.top: trayWindowUnifiedSearchInputContainer.bottom\r
+            anchors.left: parent.left\r
+            anchors.right: parent.right\r
+            anchors.topMargin: Style.trayHorizontalMargin\r
 \r
-            //     height: 1\r
-            //     color: Style.menuBorder\r
-            //     visible: trayWindowMainItem.isUnifiedSearchActive\r
-            // }\r
+            height: 1\r
+            color: palette.dark\r
+            visible: trayWindowMainItem.isUnifiedSearchActive\r
         }\r
 \r
         ErrorBox {\r
             id: unifiedSearchResultsErrorLabel\r
             visible:  UserModel.currentUser.unifiedSearchResultsListModel.errorString && !unifiedSearchResultsListView.visible && ! UserModel.currentUser.unifiedSearchResultsListModel.isSearchInProgress && ! UserModel.currentUser.unifiedSearchResultsListModel.currentFetchMoreInProgressProviderId\r
             text:  UserModel.currentUser.unifiedSearchResultsListModel.errorString\r
-            anchors.top: trayWindowUnifiedSearchInputContainer.bottom\r
+            anchors.top: bottomUnifiedSearchInputSeparator.bottom\r
             anchors.left: trayWindowMainItem.left\r
             anchors.right: trayWindowMainItem.right\r
             anchors.margins: Style.trayHorizontalMargin\r
@@ -621,7 +621,7 @@ ApplicationWindow {
         UnifiedSearchResultNothingFound {\r
             id: unifiedSearchResultNothingFound\r
 \r
-            anchors.top: trayWindowUnifiedSearchInputContainer.bottom\r
+            anchors.top: bottomUnifiedSearchInputSeparator.bottom\r
             anchors.left: trayWindowMainItem.left\r
             anchors.right: trayWindowMainItem.right\r
             anchors.topMargin: Style.trayHorizontalMargin\r
@@ -639,7 +639,7 @@ ApplicationWindow {
         Loader {\r
             id: unifiedSearchResultsListViewSkeletonLoader\r
 \r
-            anchors.top: trayWindowUnifiedSearchInputContainer.bottom\r
+            anchors.top: bottomUnifiedSearchInputSeparator.bottom\r
             anchors.left: trayWindowMainItem.left\r
             anchors.right: trayWindowMainItem.right\r
             anchors.bottom: trayWindowMainItem.bottom\r
@@ -668,7 +668,7 @@ ApplicationWindow {
             }\r
             visible: unifiedSearchResultsListView.count > 0\r
 \r
-            anchors.top: trayWindowUnifiedSearchInputContainer.bottom\r
+            anchors.top: bottomUnifiedSearchInputSeparator.bottom\r
             anchors.left: trayWindowMainItem.left\r
             anchors.right: trayWindowMainItem.right\r
             anchors.bottom: trayWindowMainItem.bottom\r