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

added theme observer

Browse source
This commit is contained in:
fluxgen 2003-02-15 01:48:16 +00:00
parent 483f82fbb8
commit 80a8703272
2 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/FbTk/Menu.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Menu.cc,v 1.8 2003/02/03 13:41:19 fluxgen Exp $ // $Id: Menu.cc,v 1.9 2003/02/15 01:48:16 fluxgen Exp $
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -60,7 +60,11 @@ Menu::Menu(MenuTheme &tm, int screen_num, ImageControl &imgctrl):
m_screen_width(DisplayWidth(m_display, screen_num)), m_screen_width(DisplayWidth(m_display, screen_num)),
m_screen_height(DisplayHeight(m_display, screen_num)), m_screen_height(DisplayHeight(m_display, screen_num)),
m_alignment(ALIGNDONTCARE), m_alignment(ALIGNDONTCARE),
m_border_width(0) { m_border_width(0),
m_themeobserver(*this) {
// make sure we get updated when the theme is reloaded
tm.addListener(m_themeobserver);
title_vis = title_vis =
movable = movable =
@ -105,7 +109,8 @@ Menu::Menu(MenuTheme &tm, int screen_num, ImageControl &imgctrl):
unsigned long attrib_mask = CWOverrideRedirect | CWEventMask; unsigned long attrib_mask = CWOverrideRedirect | CWEventMask;
XSetWindowAttributes attrib; XSetWindowAttributes attrib;
attrib.override_redirect = True; attrib.override_redirect = True;
attrib.event_mask = ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask; attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | KeyPressMask | ExposureMask;
//create menu window //create menu window
menu.window = XCreateWindow(m_display, RootWindow(m_display, screen_num), menu.window = XCreateWindow(m_display, RootWindow(m_display, screen_num),
@ -917,10 +922,16 @@ void Menu::exposeEvent(XExposeEvent &ee) {
if (ee.window == menu.title) { if (ee.window == menu.title) {
redrawTitle(); redrawTitle();
} else if (ee.window == menu.frame) { } else if (ee.window == menu.frame) {
if (menuitems.size() == 0)
return;
// this is a compilicated algorithm... lets do it step by step... // this is a compilicated algorithm... lets do it step by step...
// first... we see in which sub level the expose starts... and how many // first... we see in which sub level the expose starts... and how many
// items down in that sublevel // items down in that sublevel
if (menu.item_w == 0)
menu.item_w = 1;
if (menu.item_h == 0)
menu.item_h = 1;
unsigned int sbl = (ee.x / menu.item_w), id = (ee.y / menu.item_h), unsigned int sbl = (ee.x / menu.item_w), id = (ee.y / menu.item_h),
// next... figure out how many sublevels over the redraw spans // next... figure out how many sublevels over the redraw spans
sbl_d = ((ee.x + ee.width) / menu.item_w), sbl_d = ((ee.x + ee.width) / menu.item_w),

14
src/FbTk/Menu.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Menu.hh,v 1.7 2003/02/03 13:40:52 fluxgen Exp $ // $Id: Menu.hh,v 1.8 2003/02/15 01:47:43 fluxgen Exp $
#ifndef FBTK_MENU_HH #ifndef FBTK_MENU_HH
#define FBTK_MENU_HH #define FBTK_MENU_HH
@ -35,6 +35,7 @@
#include "EventHandler.hh" #include "EventHandler.hh"
#include "RefCount.hh" #include "RefCount.hh"
#include "Command.hh" #include "Command.hh"
#include "Observer.hh"
#include "XLayerItem.hh" #include "XLayerItem.hh"
namespace FbTk { namespace FbTk {
@ -178,6 +179,17 @@ private:
bevel_h; bevel_h;
} menu; } menu;
class ThemeObserver:public Observer {
public:
ThemeObserver(FbTk::Menu &menu):m_menu(menu) { }
void update(FbTk::Subject *subj) {
m_menu.reconfigure();
}
private:
Menu &m_menu;
};
ThemeObserver m_themeobserver;
}; };
}; // end namespace FbTk }; // end namespace FbTk