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/obrender/font.c b/obrender/font.c
index a22e23f50b1d9f19be1dfe2a32c14f4dd738aaec..2462f5a4ad57ab5b9a87731c764ff4941673e46d 100644 (file)
--- a/obrender/font.c
+++ b/obrender/font.c
@@ -169,8 +169,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,
@@ -189,7 +189,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/obrender/theme.c b/obrender/theme.c
index 1f64d6907a3523686f0a99ea2bb9582fe4b3e9d6..cdb56988916f3b2a0f5721aaf7bd14cca94d238a 100644 (file)
--- a/obrender/theme.c
+++ b/obrender/theme.c
@@ -1459,7 +1459,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

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 895279037eb2fce32d1e13c6d9636cfb5fd92c20..82d2111120253a4b3a57997251f94ad18fb7fd0b 100644 (file)
--- 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 5708cdf8d2e337c604a209cfbed53ac1525c127e..da9bb36479190f95eddbc7447c5ffb2079e9adfc 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -30,7 +30,7 @@
 #include "obt/keyboard.h"
 #include "obrender/theme.h"
 
-#define PADDING 2
+#define PADDING 0
 #define MAX_MENU_WIDTH 400
 
 #define ITEM_HEIGHT (ob_rr_theme->menu_font_height + 2*PADDING)
@@ -790,6 +790,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/screen.c b/openbox/screen.c
index 353d2de077fbe2b4e59b146ca2d7d5580f75d7a6..d0fb46c2b6e39d8e45f5e42a7093501e5296c7c8 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1715,7 +1715,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));