X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fstyle.hh;h=ec9f3f8d4263a40cb23d7e5a8b9b52ded00622fc;hb=5a139f7263e33b499836f5df9ac37400e02c32f9;hp=d13a1282c3e8dc59d50f51121ed8a9004c97516e;hpb=6852efaa9e4c5915aba5f9895a8f09cd9593083e;p=chaz%2Fopenbox

diff --git a/otk/style.hh b/otk/style.hh
index d13a1282..ec9f3f8d 100644
--- a/otk/style.hh
+++ b/otk/style.hh
@@ -13,6 +13,11 @@
 
 namespace otk {
 
+struct PixmapMask {
+  Pixmap mask;
+  unsigned int w, h;
+};
+
 class Style {
 public:
 
@@ -23,11 +28,6 @@ public:
   enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
   enum BulletType { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet };
 
-  struct PixmapMask {
-    Pixmap mask;
-    unsigned int w, h;
-  };
-
 // private:
 
   BImageControl *image_control;
@@ -62,13 +62,9 @@ public:
 public:
 
   Style();
-  Style(unsigned int);
-  Style(unsigned int, BImageControl *);
+  Style(BImageControl *);
   ~Style();
 
-  void doJustify(const std::string &text, int &start_pos,
-                 unsigned int max_length, unsigned int modifier) const;
-
   void readDatabaseMask(const std::string &rname,
                         PixmapMask &pixmapMask,
                         const Configuration &style);
@@ -85,9 +81,7 @@ public:
   BFont *readDatabaseFont(const std::string &rbasename,
                           const Configuration &style);
 
-  void load(Configuration &);
-
-  inline BColor *getBorderColor(void) { return &border_color; }
+  void load(const Configuration &style);
 
   inline BColor *getTextFocus(void) { return &l_text_focus; }
   inline BColor *getTextUnfocus(void) { return &l_text_unfocus; }
@@ -95,9 +89,6 @@ public:
   inline BColor *getButtonPicFocus(void) { return &b_pic_focus; }
   inline BColor *getButtonPicUnfocus(void) { return &b_pic_unfocus; }
 
-  inline BTexture *getFrameFocus(void) { return &f_focus; }
-  inline BTexture *getFrameUnfocus(void) { return &f_unfocus; }
-
   inline BTexture *getTitleFocus(void) { return &t_focus; }
   inline BTexture *getTitleUnfocus(void) { return &t_unfocus; }
 
@@ -111,7 +102,7 @@ public:
   inline BTexture *getButtonUnfocus(void) { return &b_unfocus; }
 
   inline BTexture *getButtonPressedFocus(void)
-  { return &b_pressed_focus; }
+  { return &b_pressed; }
   inline BTexture *getButtonPressedUnfocus(void)
   { return &b_pressed_unfocus; }
 
@@ -124,6 +115,11 @@ public:
   inline unsigned int getBorderWidth(void) const { return border_width; }
 
   inline const BFont &getFont() const { return *font; }
+
+  inline void setShadowFonts(bool fonts) { shadow_fonts = fonts; }
+  inline bool hasShadowFonts(void) const { return shadow_fonts; }
+
+  inline void setAAFonts(bool fonts) { aa_fonts = fonts; }
   inline bool hasAAFonts(void) const { return aa_fonts; }
 
   inline TextJustify textJustify(void) { return justify; }
@@ -134,8 +130,10 @@ public:
   inline const BTexture &getFrameFocus() const { return f_focus; }
   inline const BTexture &getFrameUnfocus() const { return f_unfocus; }
 
-  inline void setImageControl(BImageControl *c) { image_control = c; }
-  inline void setScreenNumber(unsigned int scr) { screen_number = scr; }
+  inline void setImageControl(BImageControl *c) {
+    image_control = c;
+    screen_number = c->getScreenInfo()->screen();
+  }
   inline unsigned int getScreen(void) { return screen_number; }
 
   // XXX add inline accessors for the rest of the bummy