Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorallexzander <allexzander@users.noreply.github.com>2022-08-10 19:16:20 +0300
committerGitHub <noreply@github.com>2022-08-10 19:16:20 +0300
commit01c90dbe3f378acf725cfaf36f69905f9fe258c4 (patch)
treef3a7c80d15347364279c04eb0fc12783535593ba
parentddcb8344377684dc6cbe3d612f5d22336b0586c6 (diff)
parent7d41530284a67098916ff57f7effe50046096f52 (diff)
Merge pull request #4839 from nextcloud/bugfix/userline-bugv3.6.0-rc1
Fix account switching and hover issues with UserLine component
-rw-r--r--src/gui/tray/UserLine.qml2
-rw-r--r--src/gui/tray/Window.qml1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index 6a064f5c8..204a7c86e 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -46,7 +46,7 @@ AbstractButton {
height: width
anchors.bottom: accountAvatar.bottom
anchors.right: accountAvatar.right
- color: accountButton.hovered || accountButton.visualFocus ? "#f6f6f6" : "white"
+ color: userLine.hovered || userLine.visualFocus ? "#f6f6f6" : "white"
radius: width*0.5
}
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index bc629d8ee..867bfc5c4 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -254,6 +254,7 @@ ApplicationWindow {
userStatusDrawer.openUserStatusDrawer(model.index);
accountMenu.close();
}
+ onClicked: UserModel.currentUserId = model.index;
}
onObjectAdded: accountMenu.insertItem(index, object)
onObjectRemoved: accountMenu.removeItem(object)