From: Mikael Magnusson <mikachu@comhem.se>
Date: Mon, 23 Jul 2007 23:48:34 +0000 (+0200)
Subject: Various style related changes.
X-Git-Tag: mikabox-3.4.6~10
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=31ed1ebd6cbb2f73f249400ed89a5517c24d4b0b;p=mikachu%2Fopenbox.git

Various style related changes.

This includes:
  Not forcing an even label_height
  Changing the cursor to BUSY (from BUSYPOINTER)
  Making the label area in the dirfocus popup different
  No menu item padding
  Nice blue colors for the focus cycle indicator
  Not making shadows increase text boundaries
---

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index da5efa56..a751048a 100644
--- a/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@ -92,13 +92,13 @@ void focus_cycle_indicator_startup(gboolean reconfig)
     window_add(&focus_indicator.bottom.window,
                INTERNAL_AS_WINDOW(&focus_indicator.bottom));
 
-    color_white = RrColorNew(ob_rr_inst, 0xff, 0xff, 0xff);
+    color_white = RrColorNew(ob_rr_inst, 0x00, 0x00, 0xff);
 
     a_focus_indicator = RrAppearanceNew(ob_rr_inst, 4);
     a_focus_indicator->surface.grad = RR_SURFACE_SOLID;
     a_focus_indicator->surface.relief = RR_RELIEF_FLAT;
     a_focus_indicator->surface.primary = RrColorNew(ob_rr_inst,
-                                                    0, 0, 0);
+                                                    0xA6, 0xCA, 0xF4);
     a_focus_indicator->texture[0].type = RR_TEXTURE_LINE_ART;
     a_focus_indicator->texture[0].data.lineart.color = color_white;
     a_focus_indicator->texture[1].type = RR_TEXTURE_LINE_ART;
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index b48b9280..cc93ba90 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "render/theme.h"
 
-#define PADDING 2
+#define PADDING 0
 #define SEPARATOR_HEIGHT 3
 #define MAX_MENU_WIDTH 400
 
@@ -729,6 +729,8 @@ void menu_frame_render(ObMenuFrame *self)
         h += th;
     }
 
+    w += 20;
+
     /* if the last entry is a labeled separator, then make its border
        overlap with the menu's outside border */
     it = g_list_last(self->entries);
diff --git a/openbox/popup.c b/openbox/popup.c
index 02c87848..b1432c45 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -179,9 +179,15 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     /* get the height, which is also used for the icon width */
     emptyy = t + b + ob_rr_theme->paddingy * 2;
-    if (self->h)
-        texth = self->h - emptyy;
-    h = texth * self->iconhm + emptyy;
+    if (self->hasicon) {
+        if (self->h)
+            h = self->h - emptyy;
+        h = h * self->iconhm + emptyy;
+    } else {
+        if (self->h)
+            texth = self->h - emptyy;
+        h = texth * self->iconhm + emptyy;
+    }
 
     if (self->textw)
         textw = self->textw;
@@ -190,8 +196,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     emptyx = l + r + ob_rr_theme->paddingx * 2;
     if (self->hasicon) {
-        iconw = texth * self->iconwm;
-        iconh = texth * self->iconhm;
+        iconw = h * self->iconwm;
+        iconh = h * self->iconhm;
         textx += iconw + ob_rr_theme->paddingx;
         if (textw)
             emptyx += ob_rr_theme->paddingx; /* between the icon and text */
diff --git a/openbox/screen.c b/openbox/screen.c
index c6c03ddc..230357c1 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1707,7 +1707,7 @@ void screen_set_root_cursor(void)
 {
     if (sn_app_starting())
         XDefineCursor(obt_display, obt_root(ob_screen),
-                      ob_cursor(OB_CURSOR_BUSYPOINTER));
+                      ob_cursor(OB_CURSOR_BUSY));
     else
         XDefineCursor(obt_display, obt_root(ob_screen),
                       ob_cursor(OB_CURSOR_POINTER));
diff --git a/render/font.c b/render/font.c
index 356b9c6e..99b6de93 100644
--- a/render/font.c
+++ b/render/font.c
@@ -158,8 +158,8 @@ static void font_measure_full(const RrFont *f, const gchar *str,
     rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
     rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
 #endif
-    *x = rect.width + ABS(shadow_x) + 4 /* we put a 2 px edge on each side */;
-    *y = rect.height + ABS(shadow_y);
+    *x = rect.width + /* ABS(shadow_x) +*/ 4 /* we put a 2 px edge on each side */;
+    *y = rect.height /*+ ABS(shadow_y) */;
 }
 
 RrSize *RrFontMeasureString(const RrFont *f, const gchar *str,
@@ -173,7 +173,7 @@ RrSize *RrFontMeasureString(const RrFont *f, const gchar *str,
 
 gint RrFontHeight(const RrFont *f, gint shadow_y)
 {
-    return (f->ascent + f->descent) / PANGO_SCALE + ABS(shadow_y);
+    return (f->ascent + f->descent) / PANGO_SCALE + 0-1;//ABS(shadow_y);
 }
 
 static inline int font_calculate_baseline(RrFont *f, gint height)
diff --git a/render/theme.c b/render/theme.c
index fba8d8e4..64fcc110 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -1352,7 +1352,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
         RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb);
         RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub);
         theme->label_height = theme->win_font_height + MAX(ft + fb, ut + ub);
-        theme->label_height += theme->label_height % 2;
 
         /* this would be nice I think, since padding.width can now be 0,
            but it breaks frame.c horribly and I don't feel like fixing that