X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frenderstyle.cc;h=482f33034c1222e679bfd92c028737c026a8db7c;hb=3dfe9f4ebeb7abd8446c52db0232b9f610a78846;hp=d9e106ab09d8f634f18ff47eb725474205e48598;hpb=059bc4dc24b68d637c3608c05344c53c64cc2c4b;p=chaz%2Fopenbox

diff --git a/otk/renderstyle.cc b/otk/renderstyle.cc
index d9e106ab..482f3303 100644
--- a/otk/renderstyle.cc
+++ b/otk/renderstyle.cc
@@ -73,11 +73,11 @@ bool RenderStyle::loadStyle(RenderStyle *s, int screen,
   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);
@@ -281,7 +281,7 @@ bool RenderStyle::loadStyle(RenderStyle *s, int screen,
   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);
@@ -455,7 +455,7 @@ bool RenderStyle::loadStyle(RenderStyle *s, int screen,
   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(),
@@ -497,11 +497,11 @@ void RenderStyle::defaultStyle(RenderStyle *s, int screen)
   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);
@@ -562,10 +562,10 @@ void RenderStyle::defaultStyle(RenderStyle *s, int screen)
                                                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,
@@ -579,10 +579,10 @@ void RenderStyle::defaultStyle(RenderStyle *s, int screen)
                                              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,
@@ -634,9 +634,6 @@ void RenderStyle::defaultStyle(RenderStyle *s, int screen)
 
 RenderStyle::~RenderStyle()
 {
-  assert(_root_color);
-  delete _root_color;
-  
   assert(_text_color_focus);
   delete _text_color_focus;
   assert(_text_color_unfocus);