summaryrefslogtreecommitdiff
path: root/src/IconbarTheme.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/IconbarTheme.hh')
-rw-r--r--src/IconbarTheme.hh21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/IconbarTheme.hh b/src/IconbarTheme.hh
index 419ab1a..9e2307b 100644
--- a/src/IconbarTheme.hh
+++ b/src/IconbarTheme.hh
@@ -26,10 +26,9 @@
26#define ICONBARTHEME_HH 26#define ICONBARTHEME_HH
27 27
28#include "FbTk/Theme.hh" 28#include "FbTk/Theme.hh"
29#include "FbTk/BorderTheme.hh"
29#include "FbTk/Texture.hh" 30#include "FbTk/Texture.hh"
30 31#include "FbTk/TextTheme.hh"
31#include "TextTheme.hh"
32#include "BorderTheme.hh"
33 32
34class IconbarTheme:public FbTk::Theme { 33class IconbarTheme:public FbTk::Theme {
35public: 34public:
@@ -39,21 +38,21 @@ public:
39 void reconfigTheme(); 38 void reconfigTheme();
40 bool fallback(FbTk::ThemeItem_base &item); 39 bool fallback(FbTk::ThemeItem_base &item);
41 40
42 TextTheme &focusedText() { return m_focused_text; } 41 FbTk::TextTheme &focusedText() { return m_focused_text; }
43 TextTheme &unfocusedText() { return m_unfocused_text; } 42 FbTk::TextTheme &unfocusedText() { return m_unfocused_text; }
43
44 const FbTk::BorderTheme &focusedBorder() const { return m_focused_border; }
45 const FbTk::BorderTheme &unfocusedBorder() const { return m_unfocused_border; }
46 const FbTk::BorderTheme &border() const { return m_border; }
44 47
45 const BorderTheme &focusedBorder() const { return m_focused_border; }
46 const BorderTheme &unfocusedBorder() const { return m_unfocused_border; }
47 const BorderTheme &border() const { return m_border; }
48
49 const FbTk::Texture &focusedTexture() const { return *m_focused_texture; } 48 const FbTk::Texture &focusedTexture() const { return *m_focused_texture; }
50 const FbTk::Texture &unfocusedTexture() const { return *m_unfocused_texture; } 49 const FbTk::Texture &unfocusedTexture() const { return *m_unfocused_texture; }
51 const FbTk::Texture &emptyTexture() const { return *m_empty_texture; } 50 const FbTk::Texture &emptyTexture() const { return *m_empty_texture; }
52 51
53private: 52private:
54 FbTk::ThemeItem<FbTk::Texture> m_focused_texture, m_unfocused_texture, m_empty_texture; 53 FbTk::ThemeItem<FbTk::Texture> m_focused_texture, m_unfocused_texture, m_empty_texture;
55 BorderTheme m_focused_border, m_unfocused_border, m_border; 54 FbTk::BorderTheme m_focused_border, m_unfocused_border, m_border;
56 TextTheme m_focused_text, m_unfocused_text; 55 FbTk::TextTheme m_focused_text, m_unfocused_text;
57 std::string m_name, m_altname; 56 std::string m_name, m_altname;
58}; 57};
59 58