aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-07-10 11:38:12 (GMT)
committerfluxgen <fluxgen>2003-07-10 11:38:12 (GMT)
commit313bc86431fb66231e835f7c01398cd566de3246 (patch)
tree7ef977884576761f1cace95b4cf6e159b145f786
parent16d5dfd6f2c1359428ea02cd3c34fc37ac130e78 (diff)
downloadfluxbox_pavel-313bc86431fb66231e835f7c01398cd566de3246.zip
fluxbox_pavel-313bc86431fb66231e835f7c01398cd566de3246.tar.bz2
added shape item
-rw-r--r--src/FbWinFrameTheme.cc6
-rw-r--r--src/FbWinFrameTheme.hh5
2 files changed, 8 insertions, 3 deletions
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index e747c03..c084748 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -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.4 2003/06/11 14:52:45 fluxgen Exp $ 22// $Id: FbWinFrameTheme.cc,v 1.5 2003/07/10 11:38:12 fluxgen Exp $
23 23
24#include "FbWinFrameTheme.hh" 24#include "FbWinFrameTheme.hh"
25#include "App.hh" 25#include "App.hh"
@@ -56,7 +56,9 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num):
56 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"),
57 57
58 m_font(*this, "window.font", "Window.Font"), 58 m_font(*this, "window.font", "Window.Font"),
59 m_textjustify(*this, "window.justify", "Window.Justify") { 59 m_textjustify(*this, "window.justify", "Window.Justify"),
60 m_shape_place(*this, "window.shape", "Window.Shape") {
61
60 // create GCs 62 // create GCs
61 Display *disp = FbTk::App::instance()->display(); 63 Display *disp = FbTk::App::instance()->display();
62 Window rootwin = RootWindow(disp, screen_num); 64 Window rootwin = RootWindow(disp, screen_num);
diff --git a/src/FbWinFrameTheme.hh b/src/FbWinFrameTheme.hh
index 5bcf90e..6acf395 100644
--- a/src/FbWinFrameTheme.hh
+++ b/src/FbWinFrameTheme.hh
@@ -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.5 2003/06/11 14:52:25 fluxgen Exp $ 22// $Id: FbWinFrameTheme.hh,v 1.6 2003/07/10 11:38:12 fluxgen Exp $
23 23
24#ifndef FBWINFRAMETHEME_HH 24#ifndef FBWINFRAMETHEME_HH
25#define FBWINFRAMETHEME_HH 25#define FBWINFRAMETHEME_HH
@@ -30,6 +30,7 @@
30#include "Color.hh" 30#include "Color.hh"
31#include "FbTk/Theme.hh" 31#include "FbTk/Theme.hh"
32#include "Subject.hh" 32#include "Subject.hh"
33#include "Shape.hh"
33 34
34class FbWinFrameTheme: public FbTk::Theme { 35class FbWinFrameTheme: public FbTk::Theme {
35public: 36public:
@@ -86,6 +87,7 @@ public:
86 inline Cursor lowerLeftAngleCursor() const { return m_cursor_lower_left_angle; } 87 inline Cursor lowerLeftAngleCursor() const { return m_cursor_lower_left_angle; }
87 inline Cursor lowerRightAngleCursor() const { return m_cursor_lower_right_angle; } 88 inline Cursor lowerRightAngleCursor() const { return m_cursor_lower_right_angle; }
88 89
90 inline Shape::ShapePlace shapePlace() const { return *m_shape_place; }
89private: 91private:
90 FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus; 92 FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus;
91 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus; 93 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus;
@@ -99,6 +101,7 @@ private:
99 101
100 FbTk::ThemeItem<FbTk::Font> m_font; 102 FbTk::ThemeItem<FbTk::Font> m_font;
101 FbTk::ThemeItem<FbTk::Justify> m_textjustify; 103 FbTk::ThemeItem<FbTk::Justify> m_textjustify;
104 FbTk::ThemeItem<Shape::ShapePlace> m_shape_place;
102 105
103 GC m_label_text_focus_gc, m_label_text_unfocus_gc; 106 GC m_label_text_focus_gc, m_label_text_unfocus_gc;
104 GC m_button_pic_focus_gc, m_button_pic_unfocus_gc; 107 GC m_button_pic_focus_gc, m_button_pic_unfocus_gc;