X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frenderstyle.cc;h=5e19aa47f8a7e51f5170495bcc097bf6b6dd559d;hb=dec0760d87f12b1c855a5e7ad9b9713e749314fc;hp=40e2597b03beac992f6cb366c7b32461e73e7b24;hpb=edcd9726300534de19c767f88022ae0fcc7a7b75;p=chaz%2Fopenbox

diff --git a/otk/renderstyle.cc b/otk/renderstyle.cc
index 40e2597b..5e19aa47 100644
--- a/otk/renderstyle.cc
+++ b/otk/renderstyle.cc
@@ -15,8 +15,8 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
     _file(stylefile)
 {
 // pick one..
-//#define FIERON
-#define MERRY
+#define FIERON
+//#define MERRY
 
 #ifdef FIERON
   _root_color = new RenderColor(_screen, 0x272a2f);
@@ -256,10 +256,10 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
                                         RenderTexture::Flat,
                                         RenderTexture::Bevel1,
                                         false,
-                                        RenderTexture::Solid,
+                                        RenderTexture::Vertical,
                                         false,
                                         0xe6e6e6,
-                                        0xe6e6e6,
+                                        0xd9d9d9,
                                         0x0,
                                         0x0);
 
@@ -268,24 +268,25 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
                                    RenderTexture::Flat,
                                    RenderTexture::Bevel1,
                                    true,
-                                   RenderTexture::Solid,
+                                   RenderTexture::Vertical,
                                    false,
                                    //0x6a6973,
                                    //0x6a6973,
                                    0x4c59a6,
- 			           0x4c59a6,
+ 			           0x5a6dbd,
 				   0x222222,
                                    0x0);
-  _label_unfocus = new RenderTexture(_screen,
+  //urg this ain't so hot
+_label_unfocus = new RenderTexture(_screen,
                           		false,
                                    RenderTexture::Flat,
                                    RenderTexture::Bevel1,
                                    true,
-                                   RenderTexture::Solid,
+                                   RenderTexture::Vertical,
                                    false,
-                                   0xcdcac7,
-                                   0xcdcac7,
-				0xb0ada9,
+                                   0xb4b2ad,
+                                   0xc3c1bc,
+				0x6a696a,
                                    0x0);
 
 
@@ -294,10 +295,10 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
                                     RenderTexture::Flat,
                                     RenderTexture::Bevel1,
                                     false,
-                                    RenderTexture::Solid,
+                                    RenderTexture::Vertical,
                                     false,
                                     0xe6e6e6,
-                                        0xe6e6e6,
+                                        0xd9d9d9,
                                     0x0,
                                     0x0);
   _handle_unfocus = new RenderTexture(_screen,
@@ -339,9 +340,9 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
   _button_press_focus = new RenderTexture(_screen,
                                           false,
                                             RenderTexture::Sunken,
-                                            RenderTexture::Bevel1,
+                                            RenderTexture::Bevel2,
                                           false,
-                                          RenderTexture::Solid,
+                                          RenderTexture::Vertical,
                                           false,
                                           0xe6e6e6,
                                           0xe6e6e6,
@@ -350,9 +351,9 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
   _button_press_unfocus = new RenderTexture(_screen,
                                             false,
                                               RenderTexture::Sunken,
-                                            RenderTexture::Bevel1,
+                                            RenderTexture::Bevel2,
                                             false,
-                                            RenderTexture::Solid,
+                                            RenderTexture::Vertical,
                                             false,
                                               0xe6e6e6,
                                         0xe6e6e6,
@@ -364,10 +365,10 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
                                   RenderTexture::Flat,
                                   RenderTexture::Bevel1,
                                   false,
-                                  RenderTexture::Solid,
+                                  RenderTexture::Vertical,
                                   false,
                                     0xe6e6e6,
-                                        0xe6e6e6,
+                                        0xd9d9d9,
                                   0x0,
                                   0x0);
   _grip_unfocus = new RenderTexture(_screen,
@@ -382,13 +383,12 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
                                     0x0,
                                     0x0);
 
-  _label_font = new Font(_screen, "Arial,Sans-10", true, 1, 0x3e);
+  _label_font = new Font(_screen, "Arial,Sans-8", true, 1, 0x3e);
   _label_justify = CenterJustify;
 
   _max_mask = new PixmapMask();
   _max_mask->w = _max_mask->h = 7;
   {
-    //char data[] = { 0x7e, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0x7e };
     char data []  = {0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f  };
     _max_mask->mask =
       XCreateBitmapFromData(**display,
@@ -399,7 +399,6 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
   _icon_mask = new PixmapMask();
   _icon_mask->w = _icon_mask->h = 7;
   {
-    //char data[] = { 0x00, 0x00, 0xc3, 0xe7, 0x7e, 0x3c, 0x18, 0x00 };
     char data[] = {0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e };
     _icon_mask->mask =
       XCreateBitmapFromData(**display,
@@ -410,7 +409,6 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
   _alldesk_mask = new PixmapMask();
   _alldesk_mask->w = _alldesk_mask->h = 7;
   {
-    //char data[] = { 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00 };
     char data[] = {0x00, 0x36, 0x36, 0x00, 0x36, 0x36, 0x00 };
     _alldesk_mask->mask =
       XCreateBitmapFromData(**display,
@@ -421,7 +419,6 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
   _close_mask = new PixmapMask();
   _close_mask->w = _close_mask->h = 7;
   {
-    //char data[] = { 0xc3, 0xe7, 0x7e, 0x3c, 0x3c, 0x7e, 0xe7, 0xc3 };
     char data[] = {  0x22, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x22 };
     _close_mask->mask =
       XCreateBitmapFromData(**display,