aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-18 15:54:11 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:57:23 (GMT)
commit99af325d43a73c08d484f122498ac1ef5ea50101 (patch)
tree935e70e91a57edc9c236b95f018b4305e993d662
parenta93a8e762238814af089579c382cc49042a33bec (diff)
downloadfluxbox_pavel-99af325d43a73c08d484f122498ac1ef5ea50101.zip
fluxbox_pavel-99af325d43a73c08d484f122498ac1ef5ea50101.tar.bz2
Attach modifiedSig handlers to the session.screenX.tabs.usePixmap resource
-rw-r--r--src/Screen.hh2
-rw-r--r--src/Window.cc11
2 files changed, 5 insertions, 8 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 0f5ee80..0321940 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -125,7 +125,7 @@ public:
125 const bool allowRemoteActions() const { return *resource.allow_remote_actions; } 125 const bool allowRemoteActions() const { return *resource.allow_remote_actions; }
126 const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; } 126 const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; }
127 const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; } 127 const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; }
128 const bool getTabsUsePixmap() const { return *resource.tabs_use_pixmap; } 128 FbTk::BoolResource &getTabsUsePixmapResource() { return resource.tabs_use_pixmap; }
129 const bool getMaxOverTabs() const { return *resource.max_over_tabs; } 129 const bool getMaxOverTabs() const { return *resource.max_over_tabs; }
130 130
131 unsigned int getTabWidth() const { return *resource.tab_width; } 131 unsigned int getTabWidth() const { return *resource.tab_width; }
diff --git a/src/Window.cc b/src/Window.cc
index e55414c..d381e17 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1061,12 +1061,6 @@ void FluxboxWindow::reconfigure() {
1061 1061
1062 frame().reconfigure(); 1062 frame().reconfigure();
1063 menu().reconfigure(); 1063 menu().reconfigure();
1064
1065 Client2ButtonMap::iterator it = m_labelbuttons.begin(),
1066 it_end = m_labelbuttons.end();
1067 for (; it != it_end; ++it)
1068 it->second->setPixmap(screen().getTabsUsePixmap());
1069
1070} 1064}
1071 1065
1072void FluxboxWindow::updateMWMHintsFromClient(WinClient &client) { 1066void FluxboxWindow::updateMWMHintsFromClient(WinClient &client) {
@@ -3683,7 +3677,10 @@ void FluxboxWindow::associateClient(WinClient &client) {
3683 btn->signalTracker().join(Fluxbox::instance()->getTabsPaddingResource().modifiedSig(), 3677 btn->signalTracker().join(Fluxbox::instance()->getTabsPaddingResource().modifiedSig(),
3684 FbTk::MemFun(static_cast<FbTk::TextButton &>(*btn), &FbTk::TextButton::setTextPadding)); 3678 FbTk::MemFun(static_cast<FbTk::TextButton &>(*btn), &FbTk::TextButton::setTextPadding));
3685 btn->setTextPadding(*Fluxbox::instance()->getTabsPaddingResource()); 3679 btn->setTextPadding(*Fluxbox::instance()->getTabsPaddingResource());
3686 btn->setPixmap(screen().getTabsUsePixmap()); 3680
3681 btn->signalTracker().join(screen().getTabsUsePixmapResource().modifiedSig(),
3682 FbTk::MemFun(*btn, &IconButton::setPixmap));
3683 btn->setPixmap(*screen().getTabsUsePixmapResource());
3687 3684
3688 m_labelbuttons[&client] = btn; 3685 m_labelbuttons[&client] = btn;
3689 3686