aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-01-02 13:04:26 (GMT)
committerfluxgen <fluxgen>2004-01-02 13:04:26 (GMT)
commit5935013854c0f4a5dd865b3f567ef3dcf2e8845a (patch)
treeb78fc85d433298a96754cdabd2afaf49beefec41
parentc9ff8760caaebaba3be3e1750bb6fce0a65bade1 (diff)
downloadfluxbox_paul-5935013854c0f4a5dd865b3f567ef3dcf2e8845a.zip
fluxbox_paul-5935013854c0f4a5dd865b3f567ef3dcf2e8845a.tar.bz2
copy label unfocus to label active instead of trying loading it from the database again
-rw-r--r--src/FbWinFrameTheme.cc16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index 3461865..296257e 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrameTheme.cc,v 1.15 2003/12/10 21:40:22 fluxgen Exp $ 22// $Id: FbWinFrameTheme.cc,v 1.16 2004/01/02 13:04:26 fluxgen Exp $
23 23
24#include "FbWinFrameTheme.hh" 24#include "FbWinFrameTheme.hh"
25#include "App.hh" 25#include "App.hh"
@@ -102,16 +102,13 @@ bool FbWinFrameTheme::fallback(FbTk::ThemeItem_base &item) {
102 else if (item.name() == "window.handleWidth") 102 else if (item.name() == "window.handleWidth")
103 return FbTk::ThemeManager::instance().loadItem(item, "handleWidth", "HandleWidth"); 103 return FbTk::ThemeManager::instance().loadItem(item, "handleWidth", "HandleWidth");
104 else if (item.name() == "window.label.active") { 104 else if (item.name() == "window.label.active") {
105 // special case for textures since they're using .load()
106 FbTk::ThemeItem<FbTk::Texture> tmp_item(m_label_active.theme(),
107 "window.label.unfocus", "Window.Label.Unfocus");
108 tmp_item.load();
109 // copy texture 105 // copy texture
110 *m_label_active = *tmp_item; 106 *m_label_active = *m_label_unfocus;
111 return true; 107 return true;
108 } else if (item.name() == "window.label.active.textColor") {
109 return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus.textColor",
110 "Window.Label.Unfocus.TextColor");
112 } 111 }
113 else if (item.name() == "window.label.active.textColor")
114 return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor");
115 112
116 113
117 return false; 114 return false;
@@ -138,8 +135,5 @@ void FbWinFrameTheme::reconfigTheme() {
138 m_label_text_active_gc.setForeground(*m_label_active_color); 135 m_label_text_active_gc.setForeground(*m_label_active_color);
139 m_button_pic_focus_gc.setForeground(*m_button_focus_color); 136 m_button_pic_focus_gc.setForeground(*m_button_focus_color);
140 m_button_pic_unfocus_gc.setForeground(*m_button_unfocus_color); 137 m_button_pic_unfocus_gc.setForeground(*m_button_unfocus_color);
141
142 // notify listeners
143 m_theme_change.notify();
144} 138}
145 139