Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regression (all desktop tasks not working)

Browse Source
This commit is contained in:
o9000
2016-01-26 20:28:01 +01:00
parent 9d9d6aa302
commit f0de284dd9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/window.c
View File

@@ -108,13 +108,17 @@ gboolean window_is_hidden(Window win)
int get_window_desktop(Window win) int get_window_desktop(Window win)
{ {
if (!server.viewports) if (!server.viewports) {
return MAX(0, MIN(server.num_desktops - 1, get_property32(win, server.atom._NET_WM_DESKTOP, XA_CARDINAL))); int desktop = get_property32(win, server.atom._NET_WM_DESKTOP, XA_CARDINAL);
if (desktop != ALL_DESKTOPS)
desktop = MAX(0, MIN(server.num_desktops - 1, desktop));
return desktop;
}
int x, y, w, h; int x, y, w, h;
get_window_coordinates(win, &x, &y, &w, &h); get_window_coordinates(win, &x, &y, &w, &h);
int desktop = MIN(get_current_desktop(), server.num_desktops - 1); int desktop = get_current_desktop();
// Window coordinates are relative to the current viewport, make them absolute // Window coordinates are relative to the current viewport, make them absolute
x += server.viewports[desktop].x; x += server.viewports[desktop].x;
y += server.viewports[desktop].y; y += server.viewports[desktop].y;