diff options
| author | Felix Weilbach <felix.weilbach@nextcloud.com> | 2021-07-14 21:24:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 21:24:47 +0300 |
| commit | 41e3b81abf72d931c2e00429941ef95de9f1e792 (patch) | |
| tree | 16635a014e84288c067a830557abc0a05ddbcace | |
| parent | 6bc6dcd59819b1b4c9252afbf82938f5a323f79d (diff) | |
| parent | 036db9d22d7dd15e07c0bdd706f0a24cf0d87d50 (diff) | |
Merge pull request #3540 from nextcloud/bugfix/position-tray-dialog-correct
Position main dialog on at tray icon if not a regular window
| -rw-r--r-- | src/gui/systray.cpp | 5 | ||||
| -rw-r--r-- | src/gui/tray/Window.qml | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 6b9f46ee2..1f4760b35 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -272,9 +272,8 @@ void Systray::pauseResumeSync() void Systray::positionWindow(QQuickWindow *window) const { - window->setScreen(currentScreen()); - - if (useNormalWindow()) { + if (!useNormalWindow()) { + window->setScreen(currentScreen()); const auto position = computeWindowPosition(window->width(), window->height()); window->setPosition(position); } diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 48e188db2..e818550a2 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -57,10 +57,7 @@ Window { onShowWindow: {
accountMenu.close();
appsMenu.close();
-
- if (!Systray.useNormalWindow) {
- Systray.positionWindow(trayWindow);
- }
+ Systray.positionWindow(trayWindow);
trayWindow.show();
trayWindow.raise();
|