all repos — fluxbox @ 7fab9c0a0b97721f893a8c12e7cb4df40f1aa4ef

custom fork of the fluxbox windowmanager

fixed bug in loading label.active
fluxgen fluxgen
commit

7fab9c0a0b97721f893a8c12e7cb4df40f1aa4ef

parent

689fdc77b09b238073e59bbb71c2a8e8b3875974

1 files changed, 10 insertions(+), 3 deletions(-)

jump to
M src/FbWinFrameTheme.ccsrc/FbWinFrameTheme.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbWinFrameTheme.cc,v 1.14 2003/12/09 08:48:08 rathnor Exp $ +// $Id: FbWinFrameTheme.cc,v 1.15 2003/12/10 21:40:22 fluxgen Exp $ #include "FbWinFrameTheme.hh" #include "App.hh"

@@ -101,8 +101,15 @@ else if (item.name() == "window.bevelWidth")

return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "bevelWidth"); else if (item.name() == "window.handleWidth") return FbTk::ThemeManager::instance().loadItem(item, "handleWidth", "HandleWidth"); - else if (item.name() == "window.label.active") - return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus", "Window.Label.Unfocus"); + else if (item.name() == "window.label.active") { + // special case for textures since they're using .load() + FbTk::ThemeItem<FbTk::Texture> tmp_item(m_label_active.theme(), + "window.label.unfocus", "Window.Label.Unfocus"); + tmp_item.load(); + // copy texture + *m_label_active = *tmp_item; + return true; + } else if (item.name() == "window.label.active.textColor") return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor");