aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-08-29 08:33:13 (GMT)
committerrathnor <rathnor>2004-08-29 08:33:13 (GMT)
commit97ef84da598aed61a6cb57a62796f302043181e8 (patch)
treefd68f9ef6703322537eca3743c3217b281d6ce7c /src/IconbarTool.cc
parent8a59b9b4541490badaf3e1a0503b4ca5f0105c8f (diff)
downloadfluxbox_pavel-97ef84da598aed61a6cb57a62796f302043181e8.zip
fluxbox_pavel-97ef84da598aed61a6cb57a62796f302043181e8.tar.bz2
a few random fixes
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r--src/IconbarTool.cc17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 5695639..100ad5b 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.42 2004/08/25 17:16:40 rathnor Exp $ 23// $Id: IconbarTool.cc,v 1.43 2004/08/29 08:33:12 rathnor Exp $
24 24
25#include "IconbarTool.hh" 25#include "IconbarTool.hh"
26 26
@@ -543,10 +543,9 @@ void IconbarTool::renderWindow(FluxboxWindow &win) {
543 renderButton(*button); 543 renderButton(*button);
544} 544}
545 545
546void IconbarTool::updateSizing() {
547 m_icon_container.setBorderWidth(m_theme.border().width());
546 548
547void IconbarTool::renderTheme() {
548
549 // update button sizes before we get max width per client!
550 IconList::iterator icon_it = m_icon_list.begin(); 549 IconList::iterator icon_it = m_icon_list.begin();
551 const IconList::iterator icon_it_end = m_icon_list.end(); 550 const IconList::iterator icon_it_end = m_icon_list.end();
552 for (; icon_it != icon_it_end; ++icon_it) { 551 for (; icon_it != icon_it_end; ++icon_it) {
@@ -555,6 +554,13 @@ void IconbarTool::renderTheme() {
555 else // unfocused 554 else // unfocused
556 (*icon_it)->setBorderWidth(m_theme.unfocusedBorder().width()); 555 (*icon_it)->setBorderWidth(m_theme.unfocusedBorder().width());
557 } 556 }
557
558}
559
560void IconbarTool::renderTheme() {
561
562 // update button sizes before we get max width per client!
563 updateSizing();
558 564
559 Pixmap tmp = m_focused_pm; 565 Pixmap tmp = m_focused_pm;
560 Pixmap err_tmp = m_focused_err_pm; 566 Pixmap err_tmp = m_focused_err_pm;
@@ -616,7 +622,8 @@ void IconbarTool::renderTheme() {
616 m_icon_container.setAlpha(m_theme.alpha()); 622 m_icon_container.setAlpha(m_theme.alpha());
617 623
618 // update buttons 624 // update buttons
619 icon_it = m_icon_list.begin(); 625 IconList::iterator icon_it = m_icon_list.begin();
626 const IconList::iterator icon_it_end = m_icon_list.end();
620 for (; icon_it != icon_it_end; ++icon_it) { 627 for (; icon_it != icon_it_end; ++icon_it) {
621 renderButton(*(*icon_it)); 628 renderButton(*(*icon_it));
622 } 629 }