diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-07-11 15:29:02 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2013-02-17 09:50:17 (GMT) |
commit | 33ee29f5d4fcc59fc9991c7127674d9cf51ff4fc (patch) | |
tree | a43fe324751ecbdb4b7ca0e045079a38c6393b67 | |
parent | 4af85aa91b3eba033c649c88159d93d73a24fc07 (diff) | |
download | fluxbox_pavel-33ee29f5d4fcc59fc9991c7127674d9cf51ff4fc.zip fluxbox_pavel-33ee29f5d4fcc59fc9991c7127674d9cf51ff4fc.tar.bz2 |
Attach a modifiedSig handler to the session.tabPadding resource
ps: this is a bonus, without this one needed to completely restart fluxbox for the updates to
tabPadding to take effect.
-rw-r--r-- | src/IconButton.hh | 2 | ||||
-rw-r--r-- | src/Window.cc | 4 | ||||
-rw-r--r-- | src/fluxbox.hh | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/IconButton.hh b/src/IconButton.hh index 36781d1..4f1587b 100644 --- a/src/IconButton.hh +++ b/src/IconButton.hh | |||
@@ -64,6 +64,8 @@ public: | |||
64 | 64 | ||
65 | bool setOrientation(FbTk::Orientation orient); | 65 | bool setOrientation(FbTk::Orientation orient); |
66 | 66 | ||
67 | FbTk::SignalTracker &signalTracker() { return m_signals; } | ||
68 | |||
67 | protected: | 69 | protected: |
68 | void drawText(int x, int y, FbTk::FbDrawable *drawable_override); | 70 | void drawText(int x, int y, FbTk::FbDrawable *drawable_override); |
69 | private: | 71 | private: |
diff --git a/src/Window.cc b/src/Window.cc index e55a258..bf46f0b 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -3681,7 +3681,9 @@ void FluxboxWindow::associateClient(WinClient &client) { | |||
3681 | frame().theme().unfocusedTheme()->iconbarTheme(), client); | 3681 | frame().theme().unfocusedTheme()->iconbarTheme(), client); |
3682 | frame().createTab(*btn); | 3682 | frame().createTab(*btn); |
3683 | 3683 | ||
3684 | btn->setTextPadding(Fluxbox::instance()->getTabsPadding()); | 3684 | btn->signalTracker().join(Fluxbox::instance()->getTabsPaddingResource().modifiedSig(), |
3685 | FbTk::MemFun(static_cast<FbTk::TextButton &>(*btn), &FbTk::TextButton::setTextPadding)); | ||
3686 | btn->setTextPadding(*Fluxbox::instance()->getTabsPaddingResource()); | ||
3685 | btn->setPixmap(screen().getTabsUsePixmap()); | 3687 | btn->setPixmap(screen().getTabsUsePixmap()); |
3686 | 3688 | ||
3687 | m_labelbuttons[&client] = btn; | 3689 | m_labelbuttons[&client] = btn; |
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index 8ce82de..d6e9281 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh | |||
@@ -124,7 +124,7 @@ public: | |||
124 | FbTk::StringResource &getAppsResource() { return m_rc_appsfile; } | 124 | FbTk::StringResource &getAppsResource() { return m_rc_appsfile; } |
125 | FbTk::StringResource &getKeysResource() { return m_rc_keyfile; } | 125 | FbTk::StringResource &getKeysResource() { return m_rc_keyfile; } |
126 | int colorsPerChannel() const { return *m_rc_colors_per_channel; } | 126 | int colorsPerChannel() const { return *m_rc_colors_per_channel; } |
127 | int getTabsPadding() const { return *m_rc_tabs_padding; } | 127 | FbTk::IntResource &getTabsPaddingResource() { return m_rc_tabs_padding; } |
128 | 128 | ||
129 | 129 | ||
130 | time_t getAutoRaiseDelay() const { return *m_rc_auto_raise_delay; } | 130 | time_t getAutoRaiseDelay() const { return *m_rc_auto_raise_delay; } |