diff options
author | fluxgen <fluxgen> | 2003-08-13 09:56:06 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-08-13 09:56:06 (GMT) |
commit | 2f9ab8617833554df04642b1e2ff85aa1aa6de89 (patch) | |
tree | 52eb5b43b8e41d1098bb4e448bed794851d6d386 /src | |
parent | df809ea1b2e6fba80ff74359dd0a562bab8d5a20 (diff) | |
download | fluxbox-2f9ab8617833554df04642b1e2ff85aa1aa6de89.zip fluxbox-2f9ab8617833554df04642b1e2ff85aa1aa6de89.tar.bz2 |
added border
Diffstat (limited to 'src')
-rw-r--r-- | src/ToolTheme.cc | 6 | ||||
-rw-r--r-- | src/ToolTheme.hh | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/ToolTheme.cc b/src/ToolTheme.cc index c52efed..fb5f2dc 100644 --- a/src/ToolTheme.cc +++ b/src/ToolTheme.cc | |||
@@ -20,14 +20,15 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: ToolTheme.cc,v 1.1 2003/08/11 14:28:38 fluxgen Exp $ | 23 | // $Id: ToolTheme.cc,v 1.2 2003/08/13 09:55:51 fluxgen Exp $ |
24 | 24 | ||
25 | #include "ToolTheme.hh" | 25 | #include "ToolTheme.hh" |
26 | 26 | ||
27 | ToolTheme::ToolTheme(int screen_num, const std::string &name, const std::string &altname): | 27 | ToolTheme::ToolTheme(int screen_num, const std::string &name, const std::string &altname): |
28 | FbTk::Theme(screen_num), | 28 | FbTk::Theme(screen_num), |
29 | TextTheme(*this, name, altname), | 29 | TextTheme(*this, name, altname), |
30 | m_texture(*this, name, altname) { | 30 | m_texture(*this, name, altname), |
31 | m_border(*this, name, altname) { | ||
31 | 32 | ||
32 | } | 33 | } |
33 | 34 | ||
@@ -36,6 +37,7 @@ ToolTheme::~ToolTheme() { | |||
36 | } | 37 | } |
37 | 38 | ||
38 | void ToolTheme::reconfigTheme() { | 39 | void ToolTheme::reconfigTheme() { |
40 | // update text theme | ||
39 | update(); | 41 | update(); |
40 | } | 42 | } |
41 | 43 | ||
diff --git a/src/ToolTheme.hh b/src/ToolTheme.hh index d25c873..88166b9 100644 --- a/src/ToolTheme.hh +++ b/src/ToolTheme.hh | |||
@@ -20,20 +20,19 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: ToolTheme.hh,v 1.1 2003/08/11 14:28:38 fluxgen Exp $ | 23 | // $Id: ToolTheme.hh,v 1.2 2003/08/13 09:56:06 fluxgen Exp $ |
24 | 24 | ||
25 | #ifndef TOOLTHEME_HH | 25 | #ifndef TOOLTHEME_HH |
26 | #define TOOLTHEME_HH | 26 | #define TOOLTHEME_HH |
27 | 27 | ||
28 | 28 | ||
29 | #include <X11/Xlib.h> | ||
30 | #include <string> | ||
31 | |||
32 | #include "TextTheme.hh" | 29 | #include "TextTheme.hh" |
30 | #include "BorderTheme.hh" | ||
33 | 31 | ||
34 | #include "FbTk/Texture.hh" | 32 | #include "FbTk/Texture.hh" |
35 | 33 | ||
36 | 34 | #include <X11/Xlib.h> | |
35 | #include <string> | ||
37 | 36 | ||
38 | /// Handles toolbar item theme for text and texture | 37 | /// Handles toolbar item theme for text and texture |
39 | class ToolTheme: public FbTk::Theme, public TextTheme { | 38 | class ToolTheme: public FbTk::Theme, public TextTheme { |
@@ -44,9 +43,10 @@ public: | |||
44 | void reconfigTheme(); | 43 | void reconfigTheme(); |
45 | // textures | 44 | // textures |
46 | const FbTk::Texture &texture() const { return *m_texture; } | 45 | const FbTk::Texture &texture() const { return *m_texture; } |
47 | 46 | const BorderTheme &border() const { return m_border; } | |
48 | private: | 47 | private: |
49 | FbTk::ThemeItem<FbTk::Texture> m_texture; | 48 | FbTk::ThemeItem<FbTk::Texture> m_texture; |
49 | BorderTheme m_border; | ||
50 | }; | 50 | }; |
51 | 51 | ||
52 | #endif // TOOLTHEME_HH | 52 | #endif // TOOLTHEME_HH |