Skip to content

Commit

Permalink
Add separators to SyncStatus and UnifiedSearchInputContainer to stop …
Browse files Browse the repository at this point in the history
…the scrollviews looking broken

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
  • Loading branch information
claucambra committed Nov 24, 2022
1 parent b48f714 commit f5b0319
Showing 1 changed file with 28 additions and 1 deletion.
29 changes: 28 additions & 1 deletion src/gui/tray/Window.qml
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,8 @@ ApplicationWindow {
id: trayWindowUnifiedSearchInputContainer
height: Style.unifiedSearchInputContainerHeight +
topInset +
bottomInset
bottomInset +
bottomUnifiedSearchInputSeparator.height

anchors.top: trayWindowHeaderBackground.bottom
anchors.left: trayWindowMainItem.left
Expand All @@ -676,12 +677,27 @@ ApplicationWindow {
topInset: Style.trayHorizontalMargin + controlRoot.padding
leftInset: Style.trayHorizontalMargin + controlRoot.padding
rightInset: Style.trayHorizontalMargin + controlRoot.padding
bottomInset: bottomUnifiedSearchInputSeparator.visible ?
Style.trayHorizontalMargin + controlRoot.padding + bottomUnifiedSearchInputSeparator.height :
0

text: UserModel.currentUser.unifiedSearchResultsListModel.searchTerm
readOnly: !UserModel.currentUser.isConnected || UserModel.currentUser.unifiedSearchResultsListModel.currentFetchMoreInProgressProviderId
isSearchInProgress: UserModel.currentUser.unifiedSearchResultsListModel.isSearchInProgress
onTextEdited: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = trayWindowUnifiedSearchInputContainer.text }
onClearText: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = "" }

Rectangle {
id: bottomUnifiedSearchInputSeparator

anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom

height: 1
color: Style.menuBorder
visible: trayWindowMainItem.isUnifiedSearchActive
}
}

ErrorBox {
Expand Down Expand Up @@ -789,6 +805,17 @@ ApplicationWindow {
anchors.top: trayWindowUnifiedSearchInputContainer.bottom
anchors.left: trayWindowMainItem.left
anchors.right: trayWindowMainItem.right

Rectangle {
id: syncStatusSeparator

anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom

height: 1
color: Style.menuBorder
}
}

ActivityList {
Expand Down

0 comments on commit f5b0319

Please sign in to comment.