aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Galiazzo <matteo@maltesenarrazioni.it>2008-04-15 08:55:14 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-04-15 08:55:14 (GMT)
commite048bdfd7a2ee472285f2243ba37efcb7b479681 (patch)
tree29d5925300cf1795c7ca67316e2d79674c624438
parentf68c36264ba0c3732ac4c72ced387a5b5fe1b489 (diff)
downloadfluxbox_pavel-e048bdfd7a2ee472285f2243ba37efcb7b479681.zip
fluxbox_pavel-e048bdfd7a2ee472285f2243ba37efcb7b479681.tar.bz2
system tray border patch from matteo
-rw-r--r--src/SystemTray.cc2
-rw-r--r--src/SystemTray.hh14
2 files changed, 11 insertions, 5 deletions
diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index 5aa7323..4275099 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -155,7 +155,7 @@ private:
155}; 155};
156 156
157SystemTray::SystemTray(const FbTk::FbWindow& parent, 157SystemTray::SystemTray(const FbTk::FbWindow& parent,
158 FbTk::ThemeProxy<ButtonTheme> &theme, BScreen& screen): 158 FbTk::ThemeProxy<ToolTheme> &theme, BScreen& screen):
159 ToolbarItem(ToolbarItem::FIXED), 159 ToolbarItem(ToolbarItem::FIXED),
160 m_window(parent, 0, 0, 1, 1, ExposureMask | ButtonPressMask | ButtonReleaseMask | 160 m_window(parent, 0, 0, 1, 1, ExposureMask | ButtonPressMask | ButtonReleaseMask |
161 SubstructureNotifyMask | SubstructureRedirectMask), 161 SubstructureNotifyMask | SubstructureRedirectMask),
diff --git a/src/SystemTray.hh b/src/SystemTray.hh
index 2e3a4ea..3215e31 100644
--- a/src/SystemTray.hh
+++ b/src/SystemTray.hh
@@ -27,6 +27,7 @@
27#include "FbTk/EventHandler.hh" 27#include "FbTk/EventHandler.hh"
28#include "FbTk/Observer.hh" 28#include "FbTk/Observer.hh"
29 29
30#include "ToolTheme.hh"
30#include "ToolbarItem.hh" 31#include "ToolbarItem.hh"
31 32
32#include <list> 33#include <list>
@@ -44,7 +45,7 @@ class SystemTray: public ToolbarItem, public FbTk::EventHandler, public FbTk::Ob
44public: 45public:
45 46
46 explicit SystemTray(const FbTk::FbWindow &parent, 47 explicit SystemTray(const FbTk::FbWindow &parent,
47 FbTk::ThemeProxy<ButtonTheme> &theme, BScreen& screen); 48 FbTk::ThemeProxy<ToolTheme> &theme, BScreen& screen);
48 virtual ~SystemTray(); 49 virtual ~SystemTray();
49 50
50 void move(int x, int y); 51 void move(int x, int y);
@@ -70,8 +71,13 @@ public:
70 int numClients() const { return m_clients.size(); } 71 int numClients() const { return m_clients.size(); }
71 const FbTk::FbWindow &window() const { return m_window; } 72 const FbTk::FbWindow &window() const { return m_window; }
72 73
73 void renderTheme(unsigned char alpha) { m_window.setAlpha(alpha); update(0); } 74 void renderTheme(unsigned char alpha) {
74 void updateSizing() {} 75 m_window.setBorderWidth(m_theme->border().width());
76 m_window.setBorderColor(m_theme->border().color());
77 m_window.setAlpha(alpha);
78 update(0);
79 }
80 void updateSizing() { m_window.setBorderWidth(m_theme->border().width()); }
75 81
76 void parentMoved() { m_window.parentMoved(); } 82 void parentMoved() { m_window.parentMoved(); }
77 83
@@ -90,7 +96,7 @@ private:
90 void showClient(TrayWindow *traywin); 96 void showClient(TrayWindow *traywin);
91 97
92 FbTk::FbWindow m_window; 98 FbTk::FbWindow m_window;
93 FbTk::ThemeProxy<ButtonTheme> &m_theme; 99 FbTk::ThemeProxy<ToolTheme> &m_theme;
94 BScreen& m_screen; 100 BScreen& m_screen;
95 Pixmap m_pixmap; 101 Pixmap m_pixmap;
96 102