X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frenderstyle.cc;h=22622931de7cc8579fbc4b595ab0022f3229b92b;hb=70e2ab8017bc50fc1442f56f2b24ad18f4844686;hp=8803c7797a786989c7ae493d609124eb520937ba;hpb=c487295c75094be3858b76b23fc9863ec9d46b59;p=chaz%2Fopenbox

diff --git a/otk/renderstyle.cc b/otk/renderstyle.cc
index 8803c779..22622931 100644
--- a/otk/renderstyle.cc
+++ b/otk/renderstyle.cc
@@ -5,17 +5,18 @@
 #endif // HAVE_CONFIG_H
 
 #include "renderstyle.hh"
-#include "rendercolor.hh"
-#include "rendertexture.hh"
 
 namespace otk {
 
-RenderStyle(int screen, const std::string &stylefile)
+RenderStyle::RenderStyle(int screen, const std::string &stylefile)
   : _screen(screen),
     _file(stylefile)
 {
-  _text_focus_color = new RenderColor(_screen, 0x272a2f);
-  _text_unfocus_color = new RenderColor(_screen, 0x676869);
+  _text_color_focus = new RenderColor(_screen, 0x272a2f);
+  _text_color_unfocus = new RenderColor(_screen, 0x676869);
+
+  _button_color_focus = new RenderColor(_screen, 0x96ba86);
+  _button_color_unfocus = new RenderColor(_screen, 0x676869);
 
   _frame_border_color = new RenderColor(_screen, 0x181f24);
   _frame_border_width = 1;
@@ -24,7 +25,8 @@ RenderStyle(int screen, const std::string &stylefile)
   _client_border_color_unfocus = new RenderColor(_screen, 0x555657);
   _client_border_width = 1;
 
-  _titlebar_focus = new RenderTexture(false,
+  _titlebar_focus = new RenderTexture(_screen,
+                                      false,
                                       RenderTexture::Flat,
                                       RenderTexture::Bevel1,
                                       false,
@@ -33,10 +35,9 @@ RenderStyle(int screen, const std::string &stylefile)
                                       0x858687,
                                       0x373a3f,
                                       0x0,
-                                      0x0,
-                                      0x0,
                                       0x0);
-  _titlebar_unfocus = new RenderTexture(false,
+  _titlebar_unfocus = new RenderTexture(_screen,
+                                        false,
                                         RenderTexture::Flat,
                                         RenderTexture::Bevel1,
                                         false,
@@ -45,11 +46,10 @@ RenderStyle(int screen, const std::string &stylefile)
                                         0x555657,
                                         0x171a1f,
                                         0x0,
-                                        0x0,
-                                        0x0,
                                         0x0);
 
-  _label_focus = new RenderTexture(false,
+  _label_focus = new RenderTexture(_screen,
+                                   false,
                                    RenderTexture::Flat,
                                    RenderTexture::Bevel1,
                                    true,
@@ -57,11 +57,10 @@ RenderStyle(int screen, const std::string &stylefile)
                                    false,
                                    0x858687,
                                    0x373a3f,
-                                   0x0,
-                                   0x0,
                                    0x181f24,
                                    0x0);
-  _label_unfocus = new RenderTexture(false,
+  _label_unfocus = new RenderTexture(_screen,
+                                     false,
                                      RenderTexture::Sunken,
                                      RenderTexture::Bevel1,
                                      false,
@@ -69,13 +68,12 @@ RenderStyle(int screen, const std::string &stylefile)
                                      false,
                                      0x555657,
                                      0x272a2f,
-                                     //XXX,
-                                     //XXX,
                                      0x0,
                                      0x0);
 
 
-  _handle_focus = new RenderTexture(false,
+  _handle_focus = new RenderTexture(_screen,
+                                    false,
                                     RenderTexture::Flat,
                                     RenderTexture::Bevel1,
                                     true,
@@ -84,10 +82,9 @@ RenderStyle(int screen, const std::string &stylefile)
                                     0x858687,
                                     0x373a3f,
                                     0x0,
-                                    0x0,
-                                    0x0,
                                     0x0);
-  _handle_unfocus = new RenderTexture(false,
+  _handle_unfocus = new RenderTexture(_screen,
+                                      false,
                                       RenderTexture::Flat,
                                       RenderTexture::Bevel1,
                                       false,
@@ -96,14 +93,112 @@ RenderStyle(int screen, const std::string &stylefile)
                                       0x555657,
                                       0x171a1f,
                                       0x0,
-                                      0x0,
-                                      0x0,
                                       0x0);
 
+  
+  _button_unpress_focus = new RenderTexture(_screen,
+                                            false,
+                                            RenderTexture::Raised,
+                                            RenderTexture::Bevel2,
+                                            false,
+                                            RenderTexture::CrossDiagonal,
+                                            false,
+                                            0x858687,
+                                            0x272a2f,
+                                            0x0,
+                                            0x0);
+  _button_unpress_unfocus = new RenderTexture(_screen,
+                                              false,
+                                              RenderTexture::Raised,
+                                              RenderTexture::Bevel2,
+                                              false,
+                                              RenderTexture::CrossDiagonal,
+                                              false,
+                                              0x555657,
+                                              0x171a1f,
+                                              0x0,
+                                              0x0);
+
+  _button_press_focus = new RenderTexture(_screen,
+                                          false,
+                                          RenderTexture::Sunken,
+                                          RenderTexture::Bevel2,
+                                          false,
+                                          RenderTexture::CrossDiagonal,
+                                          false,
+                                          0x96ba86,
+                                          0x5a724c,
+                                          0x0,
+                                          0x0);
+  _button_press_unfocus = new RenderTexture(_screen,
+                                            false,
+                                            RenderTexture::Sunken,
+                                            RenderTexture::Bevel2,
+                                            false,
+                                            RenderTexture::CrossDiagonal,
+                                            false,
+                                            0x555657,
+                                            0x171a1f,
+                                            0x0,
+                                            0x0);
+
+  _grip_focus = new RenderTexture(_screen,
+                                  false,
+                                  RenderTexture::Flat,
+                                  RenderTexture::Bevel1,
+                                  false,
+                                  RenderTexture::Vertical,
+                                  false,
+                                  0x96ba86,
+                                  0x5a724c,
+                                  0x0,
+                                  0x0);
+  _grip_unfocus = new RenderTexture(_screen,
+                                    false,
+                                    RenderTexture::Flat,
+                                    RenderTexture::Bevel1,
+                                    false,
+                                    RenderTexture::Vertical,
+                                    false,
+                                    0x555657,
+                                    0x171a1f,
+                                    0x0,
+                                    0x0);
+
+  _label_font = new Font(_screen, "Arial,Sans-9:bold", true, 1, 0x40);
 }
 
-virtual ~RenderStyle()
+RenderStyle::~RenderStyle()
 {
+  delete _text_color_focus;
+  delete _text_color_unfocus;
+
+  delete _button_color_focus;
+  delete _button_color_unfocus;
+
+  delete _frame_border_color;
+
+  delete _client_border_color_focus; 
+  delete _client_border_color_unfocus;
+ 
+  delete _titlebar_focus;
+  delete _titlebar_unfocus;
+
+  delete _label_focus;
+  delete _label_unfocus;
+
+  delete _handle_focus;
+  delete _handle_unfocus;
+
+  delete _button_unpress_focus;
+  delete _button_unpress_unfocus;
+  delete _button_press_focus;
+  delete _button_press_unfocus;
+
+  delete _grip_focus;
+  delete _grip_unfocus;
+
+  delete _label_font;
 }
 
 }