nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression (bad merge in commit 61a80b9)

Browse source
This commit is contained in:
o9000 2017-03-22 17:57:40 +01:00
parent acd1ed5768
commit bfe4873204
1 changed files with 56 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/panel.c
View file

@ -708,36 +708,68 @@ void set_panel_window_geometry(Panel *panel)
if (!panel->is_hidden) { if (!panel->is_hidden) {
if (panel_horizontal) { if (panel_horizontal) {
XMoveResizeWindow(server.display, if (panel_position & TOP)
panel->main_win, XMoveResizeWindow(server.display,
panel->posx, panel->main_win,
panel->posy, panel->posx,
panel->area.width, panel->posy,
panel->area.height); panel->area.width,
panel->area.height);
else
XMoveResizeWindow(server.display,
panel->main_win,
panel->posx,
panel->posy,
panel->area.width,
panel->area.height);
} else { } else {
XMoveResizeWindow(server.display, if (panel_position & LEFT)
panel->main_win, XMoveResizeWindow(server.display,
panel->posx, panel->main_win,
panel->posy, panel->posx,
panel->area.width, panel->posy,
panel->area.height); panel->area.width,
panel->area.height);
else
XMoveResizeWindow(server.display,
panel->main_win,
panel->posx,
panel->posy,
panel->area.width,
panel->area.height);
} }
} else { } else {
int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height; int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height;
if (panel_horizontal) { if (panel_horizontal) {
XMoveResizeWindow(server.display, if (panel_position & TOP)
panel->main_win, XMoveResizeWindow(server.display,
panel->posx, panel->main_win,
panel->posy + diff, panel->posx,
panel->hidden_width, panel->posy,
panel->hidden_height); panel->hidden_width,
panel->hidden_height);
else
XMoveResizeWindow(server.display,
panel->main_win,
panel->posx,
panel->posy + diff,
panel->hidden_width,
panel->hidden_height);
} else { } else {
XMoveResizeWindow(server.display, if (panel_position & LEFT)
panel->main_win, XMoveResizeWindow(server.display,
panel->posx + diff, panel->main_win,
panel->posy, panel->posx,
panel->hidden_width, panel->posy,
panel->hidden_height); panel->hidden_width,
panel->hidden_height);
else
XMoveResizeWindow(server.display,
panel->main_win,
panel->posx + diff,
panel->posy,
panel->hidden_width,
panel->hidden_height);
} }
} }
} }