Fix regression (bad merge in commit 61a80b9)
This commit is contained in:
32
src/panel.c
32
src/panel.c
@@ -708,6 +708,14 @@ void set_panel_window_geometry(Panel *panel)
|
|||||||
|
|
||||||
if (!panel->is_hidden) {
|
if (!panel->is_hidden) {
|
||||||
if (panel_horizontal) {
|
if (panel_horizontal) {
|
||||||
|
if (panel_position & TOP)
|
||||||
|
XMoveResizeWindow(server.display,
|
||||||
|
panel->main_win,
|
||||||
|
panel->posx,
|
||||||
|
panel->posy,
|
||||||
|
panel->area.width,
|
||||||
|
panel->area.height);
|
||||||
|
else
|
||||||
XMoveResizeWindow(server.display,
|
XMoveResizeWindow(server.display,
|
||||||
panel->main_win,
|
panel->main_win,
|
||||||
panel->posx,
|
panel->posx,
|
||||||
@@ -715,6 +723,14 @@ void set_panel_window_geometry(Panel *panel)
|
|||||||
panel->area.width,
|
panel->area.width,
|
||||||
panel->area.height);
|
panel->area.height);
|
||||||
} else {
|
} else {
|
||||||
|
if (panel_position & LEFT)
|
||||||
|
XMoveResizeWindow(server.display,
|
||||||
|
panel->main_win,
|
||||||
|
panel->posx,
|
||||||
|
panel->posy,
|
||||||
|
panel->area.width,
|
||||||
|
panel->area.height);
|
||||||
|
else
|
||||||
XMoveResizeWindow(server.display,
|
XMoveResizeWindow(server.display,
|
||||||
panel->main_win,
|
panel->main_win,
|
||||||
panel->posx,
|
panel->posx,
|
||||||
@@ -725,6 +741,14 @@ void set_panel_window_geometry(Panel *panel)
|
|||||||
} 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) {
|
||||||
|
if (panel_position & TOP)
|
||||||
|
XMoveResizeWindow(server.display,
|
||||||
|
panel->main_win,
|
||||||
|
panel->posx,
|
||||||
|
panel->posy,
|
||||||
|
panel->hidden_width,
|
||||||
|
panel->hidden_height);
|
||||||
|
else
|
||||||
XMoveResizeWindow(server.display,
|
XMoveResizeWindow(server.display,
|
||||||
panel->main_win,
|
panel->main_win,
|
||||||
panel->posx,
|
panel->posx,
|
||||||
@@ -732,6 +756,14 @@ void set_panel_window_geometry(Panel *panel)
|
|||||||
panel->hidden_width,
|
panel->hidden_width,
|
||||||
panel->hidden_height);
|
panel->hidden_height);
|
||||||
} else {
|
} else {
|
||||||
|
if (panel_position & LEFT)
|
||||||
|
XMoveResizeWindow(server.display,
|
||||||
|
panel->main_win,
|
||||||
|
panel->posx,
|
||||||
|
panel->posy,
|
||||||
|
panel->hidden_width,
|
||||||
|
panel->hidden_height);
|
||||||
|
else
|
||||||
XMoveResizeWindow(server.display,
|
XMoveResizeWindow(server.display,
|
||||||
panel->main_win,
|
panel->main_win,
|
||||||
panel->posx + diff,
|
panel->posx + diff,
|
||||||
|
|||||||
Reference in New Issue
Block a user