From c1590d1d5a3b6ba7180a6d5cc3f6a85e992183bf Mon Sep 17 00:00:00 2001 From: Manuel QuiƱones Date: Wed, 10 Oct 2012 01:00:34 +0000 Subject: GtkScale: Add margin to the scale trough to recover the original style - SL #3983 This is the same thing that current Adwaita theme does in gnome-themes-standard to make the trough smaller than the slider. The margin value is hardcoded to get it right in the XO sugar-100 theme, but should be calculated later, when we fix the sugar-72 theme. It looks like we will need different SVG images for that theme too. Signed-off-by: Manuel QuiƱones Acked-by: Simon Schampijer --- diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em index 63073ae..2792803 100644 --- a/gtk3/theme/gtk-widgets.css.em +++ b/gtk3/theme/gtk-widgets.css.em @@ -43,6 +43,11 @@ else: # About 72% of the XO size, adjusted so that eg. toolbuttons work # so the SVG displays at the correct size. # FIXME this only works for 100, has not been tested in 75 resolution radio_size = 26 + +# FIXME this should be calculated with the radio size and the bullet +# size: +scale_trough_margin = 8 + scale_slider_width = my_floor(2 * subcell_size + line_width) thickness = my_ceil(line_width) @@ -579,6 +584,11 @@ SugarPaletteWindowWidget GtkScrolledWindow * { border-style: solid; border-color: @button_grey; border-width: $(thickness)px; + margin: $(scale_trough_margin)px 0; +} + +.scale.trough.vertical { + margin: 0 $(scale_trough_margin)px; } .scale.trough:focused { -- cgit v0.9.1