--- gtk2-engines-murrine-0.90.3.orig/src/murrine_style.h +++ gtk2-engines-murrine-0.90.3/src/murrine_style.h @@ -66,6 +66,7 @@ guint8 sliderstyle; guint8 stepperstyle; guint8 toolbarstyle; + guint8 trough_border; gboolean animation; gboolean colorize_scrollbar; --- gtk2-engines-murrine-0.90.3.orig/src/murrine_style.c +++ gtk2-engines-murrine-0.90.3/src/murrine_style.c @@ -1259,12 +1259,21 @@ if (DETAIL ("slider")) { int trough_border = 0; + if (scrollbar.horizontal) { + y += murrine_style->trough_border; + height -= murrine_style->trough_border*2; + } else { + x += murrine_style->trough_border; + width -= murrine_style->trough_border*2; + } int trough_under_steppers = 1; gtk_widget_style_get (widget, "trough-border", &trough_border, "trough-under-steppers", &trough_under_steppers, NULL); + + trough_border = murrine_style->trough_border; if (trough_border > 0 || trough_under_steppers == 0 || @@ -1838,6 +1847,7 @@ murrine_style->sliderstyle = MURRINE_RC_STYLE (rc_style)->sliderstyle; murrine_style->stepperstyle = MURRINE_RC_STYLE (rc_style)->stepperstyle; murrine_style->toolbarstyle = MURRINE_RC_STYLE (rc_style)->toolbarstyle; + murrine_style->trough_border = MURRINE_RC_STYLE (rc_style)->trough_border; if (murrine_style->has_focus_color) murrine_style->focus_color = MURRINE_RC_STYLE (rc_style)->focus_color; @@ -2194,6 +2204,7 @@ mrn_style->sliderstyle = mrn_src->sliderstyle; mrn_style->stepperstyle = mrn_src->stepperstyle; mrn_style->toolbarstyle = mrn_src->toolbarstyle; + mrn_style->trough_border = mrn_src->trough_border; GTK_STYLE_CLASS (murrine_style_parent_class)->copy (style, src); } --- gtk2-engines-murrine-0.90.3.orig/src/murrine_rc_style.h +++ gtk2-engines-murrine-0.90.3/src/murrine_rc_style.h @@ -62,7 +62,8 @@ MRN_FLAG_SCROLLBARSTYLE = 1 << 24, MRN_FLAG_SLIDERSTYLE = 1 << 25, MRN_FLAG_STEPPERSTYLE = 1 << 26, - MRN_FLAG_TOOLBARSTYLE = 1 << 27 + MRN_FLAG_TOOLBARSTYLE = 1 << 27, + MRN_FLAG_TROUGH_BORDER = 1 << 28 } MurrineRcFlags; struct _MurrineRcStyle @@ -93,6 +94,7 @@ guint8 sliderstyle; guint8 stepperstyle; guint8 toolbarstyle; + guint8 trough_border; gboolean animation; gboolean colorize_scrollbar; --- gtk2-engines-murrine-0.90.3.orig/src/murrine_rc_style.c +++ gtk2-engines-murrine-0.90.3/src/murrine_rc_style.c @@ -63,6 +63,7 @@ TOKEN_SLIDERSTYLE, TOKEN_STEPPERSTYLE, TOKEN_TOOLBARSTYLE, + TOKEN_TROUGH_BORDER, TOKEN_CANDIDO, TOKEN_CLEARLOOKS, @@ -116,6 +117,7 @@ { "sliderstyle", TOKEN_SLIDERSTYLE }, { "stepperstyle", TOKEN_STEPPERSTYLE }, { "toolbarstyle", TOKEN_TOOLBARSTYLE }, + { "trough_border", TOKEN_TROUGH_BORDER }, { "CANDIDO", TOKEN_CANDIDO }, { "CLEARLOOKS", TOKEN_CLEARLOOKS }, @@ -178,6 +180,7 @@ murrine_rc->stepperstyle = 0; murrine_rc->profile = MRN_PROFILE_MURRINE; murrine_rc->toolbarstyle = 0; + murrine_rc->trough_border = 0; } #ifdef HAVE_ANIMATION @@ -581,6 +584,10 @@ token = theme_parse_int (settings, scanner, &murrine_style->toolbarstyle); murrine_style->flags |= MRN_FLAG_TOOLBARSTYLE; break; + case TOKEN_TROUGH_BORDER: + token = theme_parse_int (settings, scanner, &murrine_style->trough_border); + murrine_style->flags |= MRN_FLAG_TROUGH_BORDER; + break; /* stuff to ignore */ case TOKEN_HILIGHT_RATIO: @@ -710,6 +717,8 @@ dest_w->stepperstyle = src_w->stepperstyle; if (flags & MRN_FLAG_TOOLBARSTYLE) dest_w->toolbarstyle = src_w->toolbarstyle; + if (flags & MRN_FLAG_TROUGH_BORDER) + dest_w->trough_border = src_w->trough_border; dest_w->flags |= src_w->flags; }