From ba44df1bc56120a6f8b9a4b9612f9482a884ffce Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Tue, 04 Sep 2012 01:35:02 +0000
Subject: Make the main toolbar the right size - SL #3388

Set to zero the GtkWidget-focus-padding which was changing the size of
the buttons, and was noticeable in the toolbar because the toolbar
buttons were changing the toolbar height.  Use the toolbutton_padding
variable instead.  It was used before only for the tool buttons
border-radius, but a look at the gtk2 theme gtkrc shows that its used
there for the inner-border, which is the padding in gtk3 CSS.  It
gained 1px to make the toolbar exactly the same height than in the
gtk2 theme.  I tested this with screenshots in both sugar-100 and
sugar-72.  I'm attaching them to the ticket.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
---
diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em
index 96aa3fa..c0749e2 100644
--- a/gtk3/theme/gtk-widgets.css.em
+++ b/gtk3/theme/gtk-widgets.css.em
@@ -21,7 +21,7 @@ if scaling == "100":
     bullet_size = 9.5
     font_height = 24
     default_padding = 6
-    toolbutton_padding = 9
+    toolbutton_padding = 10
 else: # About 72% of the XO size, adjusted so that eg. toolbuttons work
     xo = False
     line_width = 2.0            # 1.62 rounded up
@@ -32,7 +32,7 @@ else: # About 72% of the XO size, adjusted so that eg. toolbuttons work
     # This is a guess on the font size (Sans 10 at 96 DPI)
     font_height = 17
     default_padding = 4         # 4.32
-    toolbutton_padding = 6      # 7.68
+    toolbutton_padding = 7      # 7.68
 
 
 # Radio size used to be:
@@ -77,7 +77,7 @@ icon_large = icon_base * 5
     -GtkEntry-focus-line-width: 0;
     -GtkScale-focus-line-width: 0;
     -GtkScale-focus-line-width: 0;
-    -GtkWidget-focus-padding: 3;
+    -GtkWidget-focus-padding: 0;
     /* 0.05 works good for both the sugar and sugar-xo themes */
     -GtkWidget-cursor-aspect-ratio: 0.05;
 
@@ -527,10 +527,10 @@ background-color: @black;
 .toolbar GtkToolButton .button,
 .toolbar SugarRadioToolButton *,
 SugarPaletteWindowWidget SugarRadioToolButton *,
-SugarPaletteWindowWidget GtkToolButton .button{
+SugarPaletteWindowWidget GtkToolButton .button {
     background-color: transparent;
     border-radius: $(toolbutton_padding)px;
-    padding: $(default_padding)px;
+    padding: $(toolbutton_padding)px;
 }
 
 .toolbar GtkToolButton .button:prelight,
--
cgit v0.9.1