diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/FbWinFrameTheme.cc | 7 | ||||
-rw-r--r-- | src/FbWinFrameTheme.hh | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc index 296257e..ce26a49 100644 --- a/src/FbWinFrameTheme.cc +++ b/src/FbWinFrameTheme.cc | |||
@@ -1,5 +1,5 @@ | |||
1 | // FbWinFrameTheme.cc for Fluxbox Window Manager | 1 | // FbWinFrameTheme.cc for Fluxbox Window Manager |
2 | // Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) | 2 | // Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
@@ -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.16 2004/01/02 13:04:26 fluxgen Exp $ | 22 | // $Id: FbWinFrameTheme.cc,v 1.17 2004/01/11 16:13:09 fluxgen Exp $ |
23 | 23 | ||
24 | #include "FbWinFrameTheme.hh" | 24 | #include "FbWinFrameTheme.hh" |
25 | #include "App.hh" | 25 | #include "App.hh" |
@@ -52,9 +52,6 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num): | |||
52 | m_label_unfocus_color(*this, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor"), | 52 | m_label_unfocus_color(*this, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor"), |
53 | m_label_active_color(*this, "window.label.active.textColor", "Window.Label.Active.TextColor"), | 53 | m_label_active_color(*this, "window.label.active.textColor", "Window.Label.Active.TextColor"), |
54 | 54 | ||
55 | m_frame_focus_color(*this, "window.frame.focusColor", "Window.Frame.FocusColor"), | ||
56 | m_frame_unfocus_color(*this, "window.frame.unfocusColor", "Window.Frame.UnfocusColor"), | ||
57 | |||
58 | m_button_focus_color(*this, "window.button.focus.picColor", "Window.Button.Focus.PicColor"), | 55 | m_button_focus_color(*this, "window.button.focus.picColor", "Window.Button.Focus.PicColor"), |
59 | m_button_unfocus_color(*this, "window.button.unfocus.picColor", "Window.Button.Unfocus.PicColor"), | 56 | m_button_unfocus_color(*this, "window.button.unfocus.picColor", "Window.Button.Unfocus.PicColor"), |
60 | 57 | ||
diff --git a/src/FbWinFrameTheme.hh b/src/FbWinFrameTheme.hh index 338251b..71f8753 100644 --- a/src/FbWinFrameTheme.hh +++ b/src/FbWinFrameTheme.hh | |||
@@ -1,5 +1,5 @@ | |||
1 | // FbWinFrameTheme.hh for Fluxbox Window Manager | 1 | // FbWinFrameTheme.hh for Fluxbox Window Manager |
2 | // Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) | 2 | // Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
@@ -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.hh,v 1.14 2004/01/02 13:05:19 fluxgen Exp $ | 22 | // $Id: FbWinFrameTheme.hh,v 1.15 2004/01/11 16:13:09 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef FBWINFRAMETHEME_HH | 24 | #ifndef FBWINFRAMETHEME_HH |
25 | #define FBWINFRAMETHEME_HH | 25 | #define FBWINFRAMETHEME_HH |
@@ -69,8 +69,6 @@ public: | |||
69 | const FbTk::Color &labelUnfocusColor() const { return *m_label_unfocus_color; } | 69 | const FbTk::Color &labelUnfocusColor() const { return *m_label_unfocus_color; } |
70 | const FbTk::Color &labelActiveColor() const { return *m_label_active_color; } | 70 | const FbTk::Color &labelActiveColor() const { return *m_label_active_color; } |
71 | 71 | ||
72 | const FbTk::Color &frameFocuscolor() const { return *m_frame_focus_color; } | ||
73 | const FbTk::Color &frameUnfocuscolor() const { return *m_frame_unfocus_color; } | ||
74 | const FbTk::Color &buttonFocuscolor() const { return *m_button_focus_color; } | 72 | const FbTk::Color &buttonFocuscolor() const { return *m_button_focus_color; } |
75 | const FbTk::Color &buttonUnfocuscolor() const { return *m_button_unfocus_color; } | 73 | const FbTk::Color &buttonUnfocuscolor() const { return *m_button_unfocus_color; } |
76 | //@} | 74 | //@} |
@@ -110,7 +108,6 @@ private: | |||
110 | FbTk::ThemeItem<FbTk::Texture> m_grip_focus, m_grip_unfocus; | 108 | FbTk::ThemeItem<FbTk::Texture> m_grip_focus, m_grip_unfocus; |
111 | 109 | ||
112 | FbTk::ThemeItem<FbTk::Color> m_label_focus_color, m_label_unfocus_color, m_label_active_color; | 110 | FbTk::ThemeItem<FbTk::Color> m_label_focus_color, m_label_unfocus_color, m_label_active_color; |
113 | FbTk::ThemeItem<FbTk::Color> m_frame_focus_color, m_frame_unfocus_color; | ||
114 | FbTk::ThemeItem<FbTk::Color> m_button_focus_color, m_button_unfocus_color; | 111 | FbTk::ThemeItem<FbTk::Color> m_button_focus_color, m_button_unfocus_color; |
115 | 112 | ||
116 | FbTk::ThemeItem<FbTk::Font> m_font; | 113 | FbTk::ThemeItem<FbTk::Font> m_font; |