added shape item
This commit is contained in:
parent
16d5dfd6f2
commit
313bc86431
2 changed files with 8 additions and 3 deletions
|
@ -19,7 +19,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: FbWinFrameTheme.cc,v 1.4 2003/06/11 14:52:45 fluxgen Exp $
|
// $Id: FbWinFrameTheme.cc,v 1.5 2003/07/10 11:38:12 fluxgen Exp $
|
||||||
|
|
||||||
#include "FbWinFrameTheme.hh"
|
#include "FbWinFrameTheme.hh"
|
||||||
#include "App.hh"
|
#include "App.hh"
|
||||||
|
@ -56,7 +56,9 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num):
|
||||||
m_button_unfocus_color(*this, "window.button.unfocus.picColor", "Window.Button.Unfocus.PicColor"),
|
m_button_unfocus_color(*this, "window.button.unfocus.picColor", "Window.Button.Unfocus.PicColor"),
|
||||||
|
|
||||||
m_font(*this, "window.font", "Window.Font"),
|
m_font(*this, "window.font", "Window.Font"),
|
||||||
m_textjustify(*this, "window.justify", "Window.Justify") {
|
m_textjustify(*this, "window.justify", "Window.Justify"),
|
||||||
|
m_shape_place(*this, "window.shape", "Window.Shape") {
|
||||||
|
|
||||||
// create GCs
|
// create GCs
|
||||||
Display *disp = FbTk::App::instance()->display();
|
Display *disp = FbTk::App::instance()->display();
|
||||||
Window rootwin = RootWindow(disp, screen_num);
|
Window rootwin = RootWindow(disp, screen_num);
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: FbWinFrameTheme.hh,v 1.5 2003/06/11 14:52:25 fluxgen Exp $
|
// $Id: FbWinFrameTheme.hh,v 1.6 2003/07/10 11:38:12 fluxgen Exp $
|
||||||
|
|
||||||
#ifndef FBWINFRAMETHEME_HH
|
#ifndef FBWINFRAMETHEME_HH
|
||||||
#define FBWINFRAMETHEME_HH
|
#define FBWINFRAMETHEME_HH
|
||||||
|
@ -30,6 +30,7 @@
|
||||||
#include "Color.hh"
|
#include "Color.hh"
|
||||||
#include "FbTk/Theme.hh"
|
#include "FbTk/Theme.hh"
|
||||||
#include "Subject.hh"
|
#include "Subject.hh"
|
||||||
|
#include "Shape.hh"
|
||||||
|
|
||||||
class FbWinFrameTheme: public FbTk::Theme {
|
class FbWinFrameTheme: public FbTk::Theme {
|
||||||
public:
|
public:
|
||||||
|
@ -86,6 +87,7 @@ public:
|
||||||
inline Cursor lowerLeftAngleCursor() const { return m_cursor_lower_left_angle; }
|
inline Cursor lowerLeftAngleCursor() const { return m_cursor_lower_left_angle; }
|
||||||
inline Cursor lowerRightAngleCursor() const { return m_cursor_lower_right_angle; }
|
inline Cursor lowerRightAngleCursor() const { return m_cursor_lower_right_angle; }
|
||||||
|
|
||||||
|
inline Shape::ShapePlace shapePlace() const { return *m_shape_place; }
|
||||||
private:
|
private:
|
||||||
FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus;
|
FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus;
|
||||||
FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus;
|
FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus;
|
||||||
|
@ -99,6 +101,7 @@ private:
|
||||||
|
|
||||||
FbTk::ThemeItem<FbTk::Font> m_font;
|
FbTk::ThemeItem<FbTk::Font> m_font;
|
||||||
FbTk::ThemeItem<FbTk::Justify> m_textjustify;
|
FbTk::ThemeItem<FbTk::Justify> m_textjustify;
|
||||||
|
FbTk::ThemeItem<Shape::ShapePlace> m_shape_place;
|
||||||
|
|
||||||
GC m_label_text_focus_gc, m_label_text_unfocus_gc;
|
GC m_label_text_focus_gc, m_label_text_unfocus_gc;
|
||||||
GC m_button_pic_focus_gc, m_button_pic_unfocus_gc;
|
GC m_button_pic_focus_gc, m_button_pic_unfocus_gc;
|
||||||
|
|
Loading…
Reference in a new issue