aboutsummaryrefslogtreecommitdiff
path: root/src/Focusable.hh
diff options
context:
space:
mode:
authorHenrik Kinnunen <fluxgen@fluxbox.org>2010-03-26 17:15:45 (GMT)
committerHenrik Kinnunen <fluxgen@fluxbox.org>2010-03-26 17:15:45 (GMT)
commitdd8fcc8b7b4c2bccf90edf9b0acfa52e21f5d1ce (patch)
tree9847618adbc8b6c156e8c3ad41bb2d55d74c1916 /src/Focusable.hh
parent9ad388c5bf160c8a6c90d76065286540274685fd (diff)
downloadfluxbox_pavel-dd8fcc8b7b4c2bccf90edf9b0acfa52e21f5d1ce.zip
fluxbox_pavel-dd8fcc8b7b4c2bccf90edf9b0acfa52e21f5d1ce.tar.bz2
Changed title signal in Focusable to new signal system
Diffstat (limited to 'src/Focusable.hh')
-rw-r--r--src/Focusable.hh17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/Focusable.hh b/src/Focusable.hh
index 6108ed9..8434a97 100644
--- a/src/Focusable.hh
+++ b/src/Focusable.hh
@@ -42,9 +42,10 @@ public:
42 m_screen(scr), m_fbwin(fbwin), 42 m_screen(scr), m_fbwin(fbwin),
43 m_instance_name("fluxbox"), m_class_name("fluxbox"), 43 m_instance_name("fluxbox"), m_class_name("fluxbox"),
44 m_focused(false), m_attention_state(false), 44 m_focused(false), m_attention_state(false),
45 m_titlesig(*this), m_diesig(*this), 45 m_diesig(*this),
46 m_attentionsig(*this), 46 m_attentionsig(*this),
47 m_focussig() { } 47 m_focussig(),
48 m_titlesig() { }
48 virtual ~Focusable() { } 49 virtual ~Focusable() { }
49 50
50 /** 51 /**
@@ -116,10 +117,11 @@ public:
116 @name signals 117 @name signals
117 @{ 118 @{
118 */ 119 */
119 // Used for both title and icon changes. 120 typedef FbTk::Signal<void, const std::string&, Focusable&> TitleSignal;
120 FbTk::Subject &titleSig() { return m_titlesig; } 121 /// Used for both title and icon changes.
121 // Used for both title and icon changes. 122 TitleSignal &titleSig() { return m_titlesig; }
122 const FbTk::Subject &titleSig() const { return m_titlesig; } 123 /// Used for both title and icon changes.
124 const TitleSignal &titleSig() const { return m_titlesig; }
123 FbTk::Signal<void, Focusable&> &focusSig() { return m_focussig; } 125 FbTk::Signal<void, Focusable&> &focusSig() { return m_focussig; }
124 const FbTk::Signal<void, Focusable&> &focusSig() const { return m_focussig; } 126 const FbTk::Signal<void, Focusable&> &focusSig() const { return m_focussig; }
125 FbTk::Subject &dieSig() { return m_diesig; } 127 FbTk::Subject &dieSig() { return m_diesig; }
@@ -143,10 +145,11 @@ protected:
143 FbTk::PixmapWithMask m_icon; //< icon pixmap with mask 145 FbTk::PixmapWithMask m_icon; //< icon pixmap with mask
144 146
145 // state and hint signals 147 // state and hint signals
146 FocusSubject m_titlesig, m_diesig, m_attentionsig; 148 FocusSubject m_diesig, m_attentionsig;
147 149
148private: 150private:
149 FbTk::Signal<void, Focusable&> m_focussig; 151 FbTk::Signal<void, Focusable&> m_focussig;
152 TitleSignal m_titlesig;
150}; 153};
151 154
152#endif // FOCUSABLE_HH 155#endif // FOCUSABLE_HH