diff options
author | rathnor <rathnor> | 2004-09-12 14:56:20 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-09-12 14:56:20 (GMT) |
commit | 42c1fd3ae3dd058e146b7350c65b74386123c25c (patch) | |
tree | cc549c2c7b12c87f8c33198f5b30f00d9dd30bc6 /src/IconbarTool.cc | |
parent | c39234195a46cece2bdb18dfdde6c91c7a190dc4 (diff) | |
download | fluxbox-42c1fd3ae3dd058e146b7350c65b74386123c25c.zip fluxbox-42c1fd3ae3dd058e146b7350c65b74386123c25c.tar.bz2 |
preliminary support for composite/compositing manager. Also general work
for consistency with transparency resources
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r-- | src/IconbarTool.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index 88670cb..b36690f 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: IconbarTool.cc,v 1.45 2004/09/05 00:37:16 fluxgen Exp $ | 23 | // $Id: IconbarTool.cc,v 1.46 2004/09/12 14:56:18 rathnor Exp $ |
24 | 24 | ||
25 | #include "IconbarTool.hh" | 25 | #include "IconbarTool.hh" |
26 | 26 | ||
@@ -309,6 +309,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, BScr | |||
309 | screen.iconListSig().attach(this); | 309 | screen.iconListSig().attach(this); |
310 | screen.currentWorkspaceSig().attach(this); | 310 | screen.currentWorkspaceSig().attach(this); |
311 | // setup focus timer | 311 | // setup focus timer |
312 | |||
312 | FbTk::RefCount<FbTk::Command> timer_cmd(new FbTk::SimpleCommand<IconbarTool>(*this, &IconbarTool::timedRender)); | 313 | FbTk::RefCount<FbTk::Command> timer_cmd(new FbTk::SimpleCommand<IconbarTool>(*this, &IconbarTool::timedRender)); |
313 | timeval to; | 314 | timeval to; |
314 | to.tv_sec = 0; | 315 | to.tv_sec = 0; |
@@ -557,6 +558,12 @@ void IconbarTool::updateSizing() { | |||
557 | 558 | ||
558 | } | 559 | } |
559 | 560 | ||
561 | void IconbarTool::renderTheme(unsigned char alpha) { | ||
562 | |||
563 | m_alpha = alpha; | ||
564 | renderTheme(); | ||
565 | } | ||
566 | |||
560 | void IconbarTool::renderTheme() { | 567 | void IconbarTool::renderTheme() { |
561 | 568 | ||
562 | // update button sizes before we get max width per client! | 569 | // update button sizes before we get max width per client! |
@@ -619,7 +626,7 @@ void IconbarTool::renderTheme() { | |||
619 | // set to zero so its consistent and not ugly | 626 | // set to zero so its consistent and not ugly |
620 | m_icon_container.setBorderWidth(m_theme.border().width()); | 627 | m_icon_container.setBorderWidth(m_theme.border().width()); |
621 | m_icon_container.setBorderColor(m_theme.border().color()); | 628 | m_icon_container.setBorderColor(m_theme.border().color()); |
622 | m_icon_container.setAlpha(m_theme.alpha()); | 629 | m_icon_container.setAlpha(m_alpha); |
623 | 630 | ||
624 | // update buttons | 631 | // update buttons |
625 | IconList::iterator icon_it = m_icon_list.begin(); | 632 | IconList::iterator icon_it = m_icon_list.begin(); |
@@ -632,7 +639,7 @@ void IconbarTool::renderTheme() { | |||
632 | void IconbarTool::renderButton(IconButton &button, bool clear) { | 639 | void IconbarTool::renderButton(IconButton &button, bool clear) { |
633 | 640 | ||
634 | button.setPixmap(*m_rc_use_pixmap); | 641 | button.setPixmap(*m_rc_use_pixmap); |
635 | button.setAlpha(m_theme.alpha()); | 642 | button.setAlpha(m_alpha); |
636 | 643 | ||
637 | // The last button is always the regular width | 644 | // The last button is always the regular width |
638 | bool wider_button = false; | 645 | bool wider_button = false; |