aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-05-07 20:41:59 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:46 (GMT)
commit57acca0b601277982e63fa34eb78ae7881873e09 (patch)
treea8f83a2a954b4bf2c8247683b61c25ac94f32cf2 /src/Toolbar.cc
parent79d526b968b0e8cec31a66b0eafa8ddeb32cc16e (diff)
downloadfluxbox-57acca0b601277982e63fa34eb78ae7881873e09.zip
fluxbox-57acca0b601277982e63fa34eb78ae7881873e09.tar.bz2
Convert ToolbarItem::resizeSig to FbTk::Signal
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 9c2d2bf..a8b2c5b 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -51,7 +51,6 @@
51#include "FbTk/BoolMenuItem.hh" 51#include "FbTk/BoolMenuItem.hh"
52#include "FbTk/IntMenuItem.hh" 52#include "FbTk/IntMenuItem.hh"
53#include "FbTk/Shape.hh" 53#include "FbTk/Shape.hh"
54#include "FbTk/SimpleObserver.hh"
55#include "FbTk/MemFun.hh" 54#include "FbTk/MemFun.hh"
56#include "FbTk/STLUtil.hh" 55#include "FbTk/STLUtil.hh"
57#include "FbTk/Util.hh" 56#include "FbTk/Util.hh"
@@ -227,8 +226,6 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::Layer &layer, size_t width):
227 m_shape(new FbTk::Shape(frame.window, 0)), 226 m_shape(new FbTk::Shape(frame.window, 0)),
228 m_resize_lock(false) { 227 m_resize_lock(false) {
229 _FB_USES_NLS; 228 _FB_USES_NLS;
230 // NOTE: first subject is always the rearrangeItem !
231 m_observers.push_back(makeObserver(*this, &Toolbar::rearrangeItems));
232 229
233 // get this on antialias change 230 // get this on antialias change
234 m_signal_tracker.join(screen().reconfigureSig(), 231 m_signal_tracker.join(screen().reconfigureSig(),
@@ -425,9 +422,8 @@ void Toolbar::reconfigure() {
425 if (item == 0) 422 if (item == 0)
426 continue; 423 continue;
427 m_item_list.push_back(item); 424 m_item_list.push_back(item);
428 // attach to first observer ( which must be rearrangeItems ) 425 m_signal_tracker.join(item->resizeSig(),
429 item->resizeSig().attach(m_observers[0]); 426 FbTk::MemFun(*this, &Toolbar::rearrangeItems));
430
431 } 427 }
432 // show all items 428 // show all items
433 frame.window.showSubwindows(); 429 frame.window.showSubwindows();