diff options
author | fluxgen <fluxgen> | 2003-12-10 21:40:22 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-12-10 21:40:22 (GMT) |
commit | 7fab9c0a0b97721f893a8c12e7cb4df40f1aa4ef (patch) | |
tree | 14ee71efe7a757b4cfcef28e766f73184a6a1498 /src | |
parent | 689fdc77b09b238073e59bbb71c2a8e8b3875974 (diff) | |
download | fluxbox-7fab9c0a0b97721f893a8c12e7cb4df40f1aa4ef.zip fluxbox-7fab9c0a0b97721f893a8c12e7cb4df40f1aa4ef.tar.bz2 |
fixed bug in loading label.active
Diffstat (limited to 'src')
-rw-r--r-- | src/FbWinFrameTheme.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc index 70312bf..3461865 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.14 2003/12/09 08:48:08 rathnor Exp $ | 22 | // $Id: FbWinFrameTheme.cc,v 1.15 2003/12/10 21:40:22 fluxgen Exp $ |
23 | 23 | ||
24 | #include "FbWinFrameTheme.hh" | 24 | #include "FbWinFrameTheme.hh" |
25 | #include "App.hh" | 25 | #include "App.hh" |
@@ -101,8 +101,15 @@ bool FbWinFrameTheme::fallback(FbTk::ThemeItem_base &item) { | |||
101 | return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "bevelWidth"); | 101 | return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "bevelWidth"); |
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 | return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus", "Window.Label.Unfocus"); | 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 | ||
110 | *m_label_active = *tmp_item; | ||
111 | return true; | ||
112 | } | ||
106 | else if (item.name() == "window.label.active.textColor") | 113 | else if (item.name() == "window.label.active.textColor") |
107 | return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor"); | 114 | return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor"); |
108 | 115 | ||