aboutsummaryrefslogtreecommitdiff
path: root/src/ToolTheme.hh
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-28 04:39:31 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-28 04:39:31 (GMT)
commit00ceefd8846bda6f4dc43a5a990086545ea28727 (patch)
treea87c37dbb853e3604b52198e6a64e8d45711fb27 /src/ToolTheme.hh
parentb5c354b994bc06667abe35e2d528c0f025703c4e (diff)
downloadfluxbox_pavel-00ceefd8846bda6f4dc43a5a990086545ea28727.zip
fluxbox_pavel-00ceefd8846bda6f4dc43a5a990086545ea28727.tar.bz2
moved BorderTheme and TextTheme to FbTk
Diffstat (limited to 'src/ToolTheme.hh')
-rw-r--r--src/ToolTheme.hh13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/ToolTheme.hh b/src/ToolTheme.hh
index 52e926a..270b67a 100644
--- a/src/ToolTheme.hh
+++ b/src/ToolTheme.hh
@@ -26,18 +26,15 @@
26#define TOOLTHEME_HH 26#define TOOLTHEME_HH
27 27
28 28
29#include "TextTheme.hh" 29#include "FbTk/TextTheme.hh"
30#include "BorderTheme.hh" 30#include "FbTk/BorderTheme.hh"
31
32#include "FbTk/Texture.hh" 31#include "FbTk/Texture.hh"
33 32
34#include <X11/Xlib.h> 33#include <X11/Xlib.h>
35#include <string> 34#include <string>
36 35
37class ToolbarTheme;
38
39/// Handles toolbar item theme for text and texture 36/// Handles toolbar item theme for text and texture
40class ToolTheme: public FbTk::Theme, public TextTheme { 37class ToolTheme: public FbTk::Theme, public FbTk::TextTheme {
41public: 38public:
42 ToolTheme(int screen_num, const std::string &name, const std::string &altname); 39 ToolTheme(int screen_num, const std::string &name, const std::string &altname);
43 virtual ~ToolTheme(); 40 virtual ~ToolTheme();
@@ -47,7 +44,7 @@ public:
47 void reconfigTheme(); 44 void reconfigTheme();
48 // textures 45 // textures
49 const FbTk::Texture &texture() const { return *m_texture; } 46 const FbTk::Texture &texture() const { return *m_texture; }
50 const BorderTheme &border() const { return m_border; } 47 const FbTk::BorderTheme &border() const { return m_border; }
51 inline unsigned char alpha() const { return m_alpha; } 48 inline unsigned char alpha() const { return m_alpha; }
52 inline void setAlpha(unsigned char alpha) { m_alpha = alpha; } 49 inline void setAlpha(unsigned char alpha) { m_alpha = alpha; }
53 50
@@ -56,7 +53,7 @@ protected:
56 53
57private: 54private:
58 FbTk::ThemeItem<FbTk::Texture> m_texture; 55 FbTk::ThemeItem<FbTk::Texture> m_texture;
59 BorderTheme m_border; 56 FbTk::BorderTheme m_border;
60 unsigned char m_alpha; 57 unsigned char m_alpha;
61}; 58};
62 59