Fix regression (bad merge in commit 61a80b9)
o9000 mrovi9000@gmail.com
1 files changed,
56 insertions(+),
24 deletions(-)
jump to
M
src/panel.c
→
src/panel.c
@@ -708,36 +708,68 @@ XSetWMNormalHints(server.display, panel->main_win, &size_hints);
if (!panel->is_hidden) { if (panel_horizontal) { - XMoveResizeWindow(server.display, - panel->main_win, - panel->posx, - panel->posy, - panel->area.width, - panel->area.height); + if (panel_position & TOP) + XMoveResizeWindow(server.display, + panel->main_win, + panel->posx, + panel->posy, + panel->area.width, + panel->area.height); + else + XMoveResizeWindow(server.display, + panel->main_win, + panel->posx, + panel->posy, + panel->area.width, + panel->area.height); } else { - XMoveResizeWindow(server.display, - panel->main_win, - panel->posx, - panel->posy, - panel->area.width, - panel->area.height); + if (panel_position & LEFT) + XMoveResizeWindow(server.display, + panel->main_win, + panel->posx, + panel->posy, + panel->area.width, + panel->area.height); + else + XMoveResizeWindow(server.display, + panel->main_win, + panel->posx, + panel->posy, + panel->area.width, + panel->area.height); } } else { int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height; if (panel_horizontal) { - XMoveResizeWindow(server.display, - panel->main_win, - panel->posx, - panel->posy + diff, - panel->hidden_width, - panel->hidden_height); + if (panel_position & TOP) + XMoveResizeWindow(server.display, + panel->main_win, + panel->posx, + panel->posy, + 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 { - XMoveResizeWindow(server.display, - panel->main_win, - panel->posx + diff, - panel->posy, - panel->hidden_width, - panel->hidden_height); + if (panel_position & LEFT) + XMoveResizeWindow(server.display, + panel->main_win, + panel->posx, + panel->posy, + panel->hidden_width, + panel->hidden_height); + else + XMoveResizeWindow(server.display, + panel->main_win, + panel->posx + diff, + panel->posy, + panel->hidden_width, + panel->hidden_height); } } }