mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3540 from nextcloud/bugfix/position-tray-dialog-correct

Browse source 
Position main dialog on at tray icon if not a regular window
This commit is contained in:
Felix Weilbach 2021-07-14 20:24:47 +02:00 committed by GitHub
commit 41e3b81abf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gui/systray.cpp
View file

@ -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);
}

5
src/gui/tray/Window.qml
View file

@ -57,10 +57,7 @@ Window {
onShowWindow: {
accountMenu.close();
appsMenu.close();
if (!Systray.useNormalWindow) {
Systray.positionWindow(trayWindow);
}
Systray.positionWindow(trayWindow);
trayWindow.show();
trayWindow.raise();