diff options
Diffstat (limited to 'src/FbWinFrameTheme.cc')
-rw-r--r-- | src/FbWinFrameTheme.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc index 06e5365..898171f 100644 --- a/src/FbWinFrameTheme.cc +++ b/src/FbWinFrameTheme.cc | |||
@@ -26,10 +26,7 @@ | |||
26 | 26 | ||
27 | #include <X11/cursorfont.h> | 27 | #include <X11/cursorfont.h> |
28 | 28 | ||
29 | #include <iostream> | 29 | FbWinFrameTheme::FbWinFrameTheme(int screen_num): |
30 | using namespace std; | ||
31 | |||
32 | FbWinFrameTheme::FbWinFrameTheme(int screen_num): | ||
33 | FbTk::Theme(screen_num), | 30 | FbTk::Theme(screen_num), |
34 | m_label_focus(*this, "window.label.focus", "Window.Label.Focus"), | 31 | m_label_focus(*this, "window.label.focus", "Window.Label.Focus"), |
35 | m_label_unfocus(*this, "window.label.unfocus", "Window.Label.Unfocus"), | 32 | m_label_unfocus(*this, "window.label.unfocus", "Window.Label.Unfocus"), |
@@ -44,14 +41,14 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num): | |||
44 | m_button_focus(*this, "window.button.focus", "Window.Button.Focus"), | 41 | m_button_focus(*this, "window.button.focus", "Window.Button.Focus"), |
45 | m_button_unfocus(*this, "window.button.unfocus", "Window.Button.Unfocus"), | 42 | m_button_unfocus(*this, "window.button.unfocus", "Window.Button.Unfocus"), |
46 | m_button_pressed(*this, "window.button.pressed", "Window.Button.Pressed"), | 43 | m_button_pressed(*this, "window.button.pressed", "Window.Button.Pressed"), |
47 | 44 | ||
48 | m_grip_focus(*this, "window.grip.focus", "Window.Grip.Focus"), | 45 | m_grip_focus(*this, "window.grip.focus", "Window.Grip.Focus"), |
49 | m_grip_unfocus(*this, "window.grip.unfocus", "Window.Grip.Unfocus"), | 46 | m_grip_unfocus(*this, "window.grip.unfocus", "Window.Grip.Unfocus"), |
50 | 47 | ||
51 | m_label_focus_color(*this, "window.label.focus.textColor", "Window.Label.Focus.TextColor"), | 48 | m_label_focus_color(*this, "window.label.focus.textColor", "Window.Label.Focus.TextColor"), |
52 | m_label_unfocus_color(*this, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor"), | 49 | 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"), | 50 | m_label_active_color(*this, "window.label.active.textColor", "Window.Label.Active.TextColor"), |
54 | 51 | ||
55 | m_button_focus_color(*this, "window.button.focus.picColor", "Window.Button.Focus.PicColor"), | 52 | m_button_focus_color(*this, "window.button.focus.picColor", "Window.Button.Focus.PicColor"), |
56 | m_button_unfocus_color(*this, "window.button.unfocus.picColor", "Window.Button.Unfocus.PicColor"), | 53 | m_button_unfocus_color(*this, "window.button.unfocus.picColor", "Window.Button.Unfocus.PicColor"), |
57 | 54 | ||
@@ -103,7 +100,7 @@ bool FbWinFrameTheme::fallback(FbTk::ThemeItem_base &item) { | |||
103 | *m_label_active = *m_label_unfocus; | 100 | *m_label_active = *m_label_unfocus; |
104 | return true; | 101 | return true; |
105 | } else if (item.name() == "window.label.active.textColor") { | 102 | } else if (item.name() == "window.label.active.textColor") { |
106 | return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus.textColor", | 103 | return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus.textColor", |
107 | "Window.Label.Unfocus.TextColor"); | 104 | "Window.Label.Unfocus.TextColor"); |
108 | } | 105 | } |
109 | 106 | ||