s->_screen = screen;
s->_file = stylefile;
// pick one..
-//#define FIERON
-#define MERRY
+#define FIERON
+//#define MERRY
#ifdef FIERON
- s->_root_color = new RenderColor(screen, 0x272a2f);
+ s->_root_args = "#272a2f";
s->_text_color_focus = new RenderColor(screen, 0x272a2f);
s->_text_color_unfocus = new RenderColor(screen, 0x676869);
s->_handle_width = 4;
#else
# ifdef MERRY
- s->_root_color = new RenderColor(screen, 0x7b756a);
+ s->_root_args = "#7b756a";
s->_text_color_focus = new RenderColor(screen, 0xffffff);
s->_text_color_unfocus = new RenderColor(screen, 0xffffff);
s->_icon_mask = new PixmapMask();
s->_icon_mask->w = s->_icon_mask->h = 7;
{
- char data[] = {0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e };
+ char data[] = { 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e };
s->_icon_mask->mask =
XCreateBitmapFromData(**display,
display->screenInfo(screen)->rootWindow(),
s->_screen = screen;
s->_file = "";
- s->_root_color = new RenderColor(screen, 0);
+ s->_root_args = "#000000";
s->_text_color_focus = new RenderColor(screen, 0xffffff);
s->_text_color_unfocus = new RenderColor(screen, 0xffffff);
- s->_button_color_focus = new RenderColor(screen, 0);
- s->_button_color_unfocus = new RenderColor(screen, 0);
+ s->_button_color_focus = new RenderColor(screen, 0xffffff);
+ s->_button_color_unfocus = new RenderColor(screen, 0xffffff);
s->_frame_border_color = new RenderColor(screen, 0);
s->_frame_border_width = 1;
s->_client_border_color_focus = new RenderColor(screen, 0);
false,
RenderTexture::Flat,
RenderTexture::Bevel1,
- false,
+ true,
RenderTexture::Solid,
false,
- 0, 0, 0, 0);
+ 0, 0, 0xffffff, 0);
s->_button_unpress_unfocus = new RenderTexture(screen,
false,
RenderTexture::Flat,
false,
RenderTexture::Flat,
RenderTexture::Bevel1,
- false,
+ true,
RenderTexture::Solid,
false,
- 0, 0, 0, 0);
+ 0, 0, 0xffffff, 0);
s->_button_press_unfocus = new RenderTexture(screen,
false,
RenderTexture::Flat,
RenderStyle::~RenderStyle()
{
- assert(_root_color);
- delete _root_color;
-
assert(_text_color_focus);
delete _text_color_focus;
assert(_text_color_unfocus);