aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/IconbarTool.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fd1c184..9f66863 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/03/10: 3*07/03/10:
4 * Fixed changing iconbar text padding requiring a toolbar refresh (Mark)
5 IconbarTool.cc
4 * Fixed stealing focus from unmanaged windows (Mark) 6 * Fixed stealing focus from unmanaged windows (Mark)
5 fluxbox.cc 7 fluxbox.cc
6*07/03/07: 8*07/03/07:
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 30db541..da9fb59 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -694,6 +694,7 @@ void IconbarTool::renderButton(IconButton &button, bool clear,
694 694
695 button.setPixmap(*m_rc_use_pixmap); 695 button.setPixmap(*m_rc_use_pixmap);
696 button.setAlpha(m_alpha); 696 button.setAlpha(m_alpha);
697 button.setTextPadding(*m_rc_client_padding);
697 698
698 // The last button is always the regular width 699 // The last button is always the regular width
699 bool wider_button = false; 700 bool wider_button = false;
@@ -804,8 +805,6 @@ void IconbarTool::addWindow(FluxboxWindow &win) {
804 win); 805 win);
805 806
806 807
807 button->setTextPadding(*m_rc_client_padding);
808
809 renderButton(*button, false); // update the attributes, but don't clear it 808 renderButton(*button, false); // update the attributes, but don't clear it
810 m_icon_container.insertItem(button); 809 m_icon_container.insertItem(button);
811 m_icon_list.push_back(button); 810 m_icon_list.push_back(button);