aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/IconButton.hh2
-rw-r--r--src/Window.cc4
-rw-r--r--src/fluxbox.hh2
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
67protected: 69protected:
68 void drawText(int x, int y, FbTk::FbDrawable *drawable_override); 70 void drawText(int x, int y, FbTk::FbDrawable *drawable_override);
69private: 71private:
diff --git a/src/Window.cc b/src/Window.cc
index 19f6fae..ebe3428 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3674,7 +3674,9 @@ void FluxboxWindow::associateClient(WinClient &client) {
3674 frame().theme().unfocusedTheme()->iconbarTheme(), client); 3674 frame().theme().unfocusedTheme()->iconbarTheme(), client);
3675 frame().createTab(*btn); 3675 frame().createTab(*btn);
3676 3676
3677 btn->setTextPadding(Fluxbox::instance()->getTabsPadding()); 3677 btn->signalTracker().join(Fluxbox::instance()->getTabsPaddingResource().modifiedSig(),
3678 FbTk::MemFun(static_cast<FbTk::TextButton &>(*btn), &FbTk::TextButton::setTextPadding));
3679 btn->setTextPadding(*Fluxbox::instance()->getTabsPaddingResource());
3678 btn->setPixmap(screen().getTabsUsePixmap()); 3680 btn->setPixmap(screen().getTabsUsePixmap());
3679 3681
3680 m_labelbuttons[&client] = btn; 3682 m_labelbuttons[&client] = btn;
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 3e9e8d6..6c82c00 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; }