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

Cleaned a little bit strut handling. Oddly, this fixed strut ignoring value for xfwm4...

Browse Source
This commit is contained in:
Sanel Zukan 2013-03-04 23:18:17 +00:00
parent a8b01d75c1
commit 70e9a9b0b6
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ede-panel/Panel.cpp
View File

@ -1,7 +1,7 @@
/* /*
* $Id$ * $Id$
* *
* Copyright (C) 2012 Sanel Zukan * Copyright (C) 2012-2013 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
@ -366,6 +366,24 @@ void Panel::do_layout(void) {
} }
} }
void Panel::set_strut(short state) {
if(state & PANEL_STRUT_REMOVE)
netwm_window_remove_strut(fl_xid(this));
/* no other flags */
if(state == PANEL_STRUT_REMOVE) return;
int sizes[4] = {0, 0, 0, 0};
if(state & PANEL_STRUT_BOTTOM)
sizes[3] = h();
else
sizes[2] = h();
/* TODO: netwm_window_set_strut_partial() */
netwm_window_set_strut(fl_xid(this), sizes[0], sizes[1], sizes[2], sizes[3]);
}
void Panel::show(void) { void Panel::show(void) {
if(shown()) return; if(shown()) return;
@ -382,9 +400,7 @@ void Panel::show(void) {
void Panel::hide(void) { void Panel::hide(void) {
Fl::remove_handler(x_events); Fl::remove_handler(x_events);
netwm_window_remove_strut(fl_xid(this)); set_strut(PANEL_STRUT_REMOVE);
E_DEBUG("Panel::hide()\n");
/* clear loaded widgets */ /* clear loaded widgets */
mgr.clear(this); mgr.clear(this);
@ -433,17 +449,13 @@ void Panel::update_size_and_pos(bool create_xid, bool update_strut, int X, int Y
/* position it, this is done after XID was created */ /* position it, this is done after XID was created */
if(vpos == PANEL_POSITION_BOTTOM) { if(vpos == PANEL_POSITION_BOTTOM) {
position(X, screen_h - h()); position(X, screen_h - h());
if(width_perc >= 100 && update_strut) { if(width_perc >= 100 && update_strut)
netwm_window_remove_strut(fl_xid(this)); set_strut(PANEL_STRUT_REMOVE | PANEL_STRUT_BOTTOM);
netwm_window_set_strut(fl_xid(this), 0, 0, 0, h());
}
} else { } else {
/* FIXME: this does not work well with edewm (nor pekwm). kwin do it correctly. */ /* FIXME: this does not work well with edewm (nor pekwm). kwin do it correctly. */
position(X, Y); position(X, Y);
if(width_perc >= 100 && update_strut) { if(width_perc >= 100 && update_strut)
netwm_window_remove_strut(fl_xid(this)); set_strut(PANEL_STRUT_REMOVE | PANEL_STRUT_TOP);
netwm_window_set_strut(fl_xid(this), 0, 0, h(), 0);
}
} }
} }
@ -472,14 +484,14 @@ int Panel::handle(int e) {
if(Fl::event_y_root() <= screen_h_half && y() > screen_h_half) { if(Fl::event_y_root() <= screen_h_half && y() > screen_h_half) {
position(x(), screen_y); position(x(), screen_y);
if(width_perc >= 100) if(width_perc >= 100)
netwm_window_set_strut(fl_xid(this), 0, 0, h(), 0); set_strut(PANEL_STRUT_TOP);
vpos = PANEL_POSITION_TOP; vpos = PANEL_POSITION_TOP;
} }
if(Fl::event_y_root() > screen_h_half && y() < screen_h_half) { if(Fl::event_y_root() > screen_h_half && y() < screen_h_half) {
position(x(), screen_h - h()); position(x(), screen_h - h());
if(width_perc >= 100) if(width_perc >= 100)
netwm_window_set_strut(fl_xid(this), 0, 0, 0, h()); set_strut(PANEL_STRUT_BOTTOM);
vpos = PANEL_POSITION_BOTTOM; vpos = PANEL_POSITION_BOTTOM;
} }

9
ede-panel/Panel.h
View File

@ -34,6 +34,13 @@ enum {
PANEL_POSITION_BOTTOM PANEL_POSITION_BOTTOM
}; };
/* combination of what to do with strut data */
enum {
PANEL_STRUT_REMOVE = (1 << 1),
PANEL_STRUT_BOTTOM = (1 << 2),
PANEL_STRUT_TOP = (1 << 3)
};
class Hider; class Hider;
class Panel : public PanelWindow { class Panel : public PanelWindow {
@ -52,7 +59,7 @@ private:
void read_config(void); void read_config(void);
void save_config(void); void save_config(void);
void do_layout(void); void do_layout(void);
void set_strut(short state);
public: public:
Panel(); Panel();