diff options
| author | lilac | 2022-12-01 04:42:25 +0800 |
|---|---|---|
| committer | lilac | 2022-12-01 04:42:25 +0800 |
| commit | a490f786294e6167cba6fcdc20e9285afb1e2d89 (patch) | |
| tree | 3be9611eb1d7cf1b88046b346ef0584de2257e46 /009-properly-handle-i3wm.patch | |
| parent | 8fe336f99c610c54f055285bd60a33907c91dd06 (diff) | |
| download | aur-a490f786294e6167cba6fcdc20e9285afb1e2d89.tar.gz | |
[lilac] updated to 97711-2
Diffstat (limited to '009-properly-handle-i3wm.patch')
| -rw-r--r-- | 009-properly-handle-i3wm.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/009-properly-handle-i3wm.patch b/009-properly-handle-i3wm.patch index b8ade3678d79..7d544fb79770 100644 --- a/009-properly-handle-i3wm.patch +++ b/009-properly-handle-i3wm.patch @@ -14,17 +14,16 @@ diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.c index 9c5faa42..5439e2a7 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp -@@ -443,8 +443,8 @@ const QRect UIDesktopWidgetWatchdog::availableGeometry(int iHostScreenIndex /* = +@@ -385,7 +385,7 @@ QRect UIDesktopWidgetWatchdog::available /* Get cached available-geometry: */ - const QRect availableGeometry = m_availableGeometryData.value(iHostScreenIndex); + const QRect availableGeometry = m_availableGeometryData.value(screenToIndex(pScreen)); /* Return cached available-geometry if it's valid or screen-geometry otherwise: */ -- return availableGeometry.isValid() ? availableGeometry : -- QApplication::desktop()->screenGeometry(iHostScreenIndex); -+ return availableGeometry.isValid() && NativeWindowSubsystem::X11WindowManagerType() != X11WMType_i3 ? -+ availableGeometry : QApplication::desktop()->screenGeometry(iHostScreenIndex); - # endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */ - # else /* !VBOX_WS_X11 */ - /* Redirect call to desktop-widget: */ +- return availableGeometry.isValid() ? availableGeometry : screenGeometry(pScreen); ++ return availableGeometry.isValid() && NativeWindowSubsystem::X11WindowManagerType() != X11WMType_i3 ? availableGeometry : screenGeometry(pScreen); + # endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */ + #else /* !VBOX_WS_X11 */ + /* Just return screen available-geometry: */ + diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp index 53927559..ea648da7 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp |