aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r--src/IconbarTool.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index d4cdd3d..ae14fc3 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.35 2004/03/22 20:08:08 fluxgen Exp $ 23// $Id: IconbarTool.cc,v 1.36 2004/04/26 15:04:37 rathnor Exp $
24 24
25#include "IconbarTool.hh" 25#include "IconbarTool.hh"
26 26
@@ -597,9 +597,10 @@ void IconbarTool::renderButton(IconButton &button) {
597 button.setPixmap(*m_rc_use_pixmap); 597 button.setPixmap(*m_rc_use_pixmap);
598 button.setAlpha(m_theme.alpha()); 598 button.setAlpha(m_theme.alpha());
599 599
600 // if we're rendering a button, there must be a back button.
601 // The last button is always the regular width 600 // The last button is always the regular width
602 bool wider_button = (button.width() != m_icon_container.back()->width()); 601 bool wider_button = false;
602 if (!m_icon_container.empty())
603 wider_button = (button.width() != m_icon_container.back()->width());
603 604
604 if (button.win().isFocused()) { // focused texture 605 if (button.win().isFocused()) { // focused texture
605 m_icon_container.setSelected(m_icon_container.find(&button)); 606 m_icon_container.setSelected(m_icon_container.find(&button));
@@ -685,6 +686,7 @@ void IconbarTool::addWindow(FluxboxWindow &win) {
685 return; 686 return;
686 687
687 IconButton *button = new IconButton(m_icon_container, m_theme.focusedText().font(), win); 688 IconButton *button = new IconButton(m_icon_container, m_theme.focusedText().font(), win);
689 renderButton(*button);
688 m_icon_container.insertItem(button); 690 m_icon_container.insertItem(button);
689 m_icon_list.push_back(button); 691 m_icon_list.push_back(button);
690 692