aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrame.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-05-06 21:17:13 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:46 (GMT)
commit2073ae12a4e633d18f49559111131fffbc495dbd (patch)
tree66d42e79fc90f58ddb38fa105e4cc68b63362cb5 /src/FbWinFrame.hh
parentff49160b120edd8d9396f10dab5a97bace8724ec (diff)
downloadfluxbox-2073ae12a4e633d18f49559111131fffbc495dbd.zip
fluxbox-2073ae12a4e633d18f49559111131fffbc495dbd.tar.bz2
Convert FbWinFrame::frameExtentSig to FbTk::Signal
Also, I spotted a potential bug in the code. I marked the place with XXX. Someone should take a look at that.
Diffstat (limited to 'src/FbWinFrame.hh')
-rw-r--r--src/FbWinFrame.hh7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 6c52566..5e13301 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -27,13 +27,13 @@
27#include "FbTk/FbWindow.hh" 27#include "FbTk/FbWindow.hh"
28#include "FbTk/EventHandler.hh" 28#include "FbTk/EventHandler.hh"
29#include "FbTk/RefCount.hh" 29#include "FbTk/RefCount.hh"
30#include "FbTk/Subject.hh"
31#include "FbTk/Color.hh" 30#include "FbTk/Color.hh"
32#include "FbTk/LayerItem.hh" 31#include "FbTk/LayerItem.hh"
33#include "FbTk/TextButton.hh" 32#include "FbTk/TextButton.hh"
34#include "FbTk/DefaultValue.hh" 33#include "FbTk/DefaultValue.hh"
35#include "FbTk/Container.hh" 34#include "FbTk/Container.hh"
36#include "FbTk/Shape.hh" 35#include "FbTk/Shape.hh"
36#include "FbTk/Signal.hh"
37 37
38#include <vector> 38#include <vector>
39#include <memory> 39#include <memory>
@@ -231,8 +231,7 @@ public:
231 const FbTk::LayerItem &layerItem() const { return m_layeritem; } 231 const FbTk::LayerItem &layerItem() const { return m_layeritem; }
232 FbTk::LayerItem &layerItem() { return m_layeritem; } 232 FbTk::LayerItem &layerItem() { return m_layeritem; }
233 233
234 const FbTk::Subject &frameExtentSig() const { return m_frame_extent_sig; } 234 FbTk::Signal<> &frameExtentSig() { return m_frame_extent_sig; }
235 FbTk::Subject &frameExtentSig() { return m_frame_extent_sig; }
236 /// @returns true if the window is inside titlebar, 235 /// @returns true if the window is inside titlebar,
237 /// assuming window is an event window that was generated for this frame. 236 /// assuming window is an event window that was generated for this frame.
238 bool insideTitlebar(Window win) const; 237 bool insideTitlebar(Window win) const;
@@ -318,7 +317,7 @@ private:
318 FbTk::FbWindow m_clientarea; ///< window that sits behind client window to fill gaps @see setClientWindow 317 FbTk::FbWindow m_clientarea; ///< window that sits behind client window to fill gaps @see setClientWindow
319 //@} 318 //@}
320 319
321 FbTk::Subject m_frame_extent_sig; 320 FbTk::Signal<> m_frame_extent_sig;
322 321
323 typedef std::vector<FbTk::Button *> ButtonList; 322 typedef std::vector<FbTk::Button *> ButtonList;
324 ButtonList m_buttons_left, ///< buttons to the left 323 ButtonList m_buttons_left, ///< buttons to the left