mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Fixing bug 208 - Panel (position 0!) displaced on startup

Browse Source
This commit is contained in:
Sanel Zukan 2014-07-09 12:50:17 +00:00
parent a2b2ae0e27
commit 0d0cc8d8b1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ede-panel/Panel.cpp
View File

@ -1,7 +1,7 @@
/* /*
* $Id$ * $Id$
* *
* Copyright (C) 2012-2013 Sanel Zukan * Copyright (C) 2012-2014 Sanel Zukan
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -397,11 +397,7 @@ void Panel::set_strut(short state) {
if(state == PANEL_STRUT_REMOVE) return; if(state == PANEL_STRUT_REMOVE) return;
int sizes[4] = {0, 0, 0, 0}; int sizes[4] = {0, 0, 0, 0};
sizes[state & PANEL_STRUT_BOTTOM ? 3 : 2] = h();
if(state & PANEL_STRUT_BOTTOM)
sizes[3] = h();
else
sizes[2] = h();
/* TODO: netwm_window_set_strut_partial() */ /* TODO: netwm_window_set_strut_partial() */
netwm_window_set_strut(fl_xid(this), sizes[0], sizes[1], sizes[2], sizes[3]); netwm_window_set_strut(fl_xid(this), sizes[0], sizes[1], sizes[2], sizes[3]);
@ -475,8 +471,12 @@ void Panel::update_size_and_pos(bool create_xid, bool update_strut, int X, int Y
if(width_perc >= 100 && update_strut) if(width_perc >= 100 && update_strut)
set_strut(PANEL_STRUT_REMOVE | PANEL_STRUT_BOTTOM); set_strut(PANEL_STRUT_REMOVE | PANEL_STRUT_BOTTOM);
} else { } else {
/* FIXME: this does not work well with edewm (nor pekwm). kwin do it correctly. */ /*
position(X, Y); * I'm not sure what the hell is going on here; if 'y == 0', X will
* move panel few pixels down, even if FLTK is reporting y() == 0.
* Seems like 1 will solve this.
*/
position(X, Y == 0 ? 1 : Y);
if(width_perc >= 100 && update_strut) if(width_perc >= 100 && update_strut)
set_strut(PANEL_STRUT_REMOVE | PANEL_STRUT_TOP); set_strut(PANEL_STRUT_REMOVE | PANEL_STRUT_TOP);
} }