From a53dabd36a1922fd2ce1371596690700e34d03f9 Mon Sep 17 00:00:00 2001
From: markt <markt>
Date: Sun, 7 Jan 2007 18:38:03 +0000
Subject: fix little bug with iconbar rendering

---
 ChangeLog          | 2 ++
 src/IconbarTool.cc | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 37c3fc0..cd976c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *07/01/07:
+   * Fix little bug with iconbar rendering, bug #1549209 (Mark)
+     IconbarTool.cc
    * Fix RefCount crash and Slit deconstruction ordering (Simon)
      RefCount.hh Slit.hh/cc
    * Support per-window transparency settings.
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 2203f94..86d7f51 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -570,7 +570,12 @@ void IconbarTool::update(FbTk::Subject *subj) {
 
     // another renderTheme we hopefully shouldn't need? These renders
     // should be done individually above
-    // renderTheme();
+
+    // nope, we still need it (or at least I'm not bothering to fix it yet)
+    // a new IconButton doesn't get resized properly until the
+    // m_icon_container.update() above; then, it never runs drawText() again,
+    // so text can end up behind program icons
+    renderTheme();
 }
 
 IconButton *IconbarTool::findButton(FluxboxWindow &win) {
-- 
cgit v0.11.2