From 8a5d065387cf8f912c4a19bc9f05944be9ded29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Mon, 3 Sep 2012 22:35:02 -0300
Subject: [PATCH sugar-artwork 2/2] Make the main toolbar the right size - SL
#3388
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>
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>
---
gtk3/theme/gtk-widgets.css.em | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em
index 96aa3fa..c0749e2 100644
a
|
b
|
if scaling == "100": |
21 | 21 | bullet_size = 9.5 |
22 | 22 | font_height = 24 |
23 | 23 | default_padding = 6 |
24 | | toolbutton_padding = 9 |
| 24 | toolbutton_padding = 10 |
25 | 25 | else: # About 72% of the XO size, adjusted so that eg. toolbuttons work |
26 | 26 | xo = False |
27 | 27 | line_width = 2.0 # 1.62 rounded up |
… |
… |
else: # About 72% of the XO size, adjusted so that eg. toolbuttons work |
32 | 32 | # This is a guess on the font size (Sans 10 at 96 DPI) |
33 | 33 | font_height = 17 |
34 | 34 | default_padding = 4 # 4.32 |
35 | | toolbutton_padding = 6 # 7.68 |
| 35 | toolbutton_padding = 7 # 7.68 |
36 | 36 | |
37 | 37 | |
38 | 38 | # Radio size used to be: |
… |
… |
icon_large = icon_base * 5 |
77 | 77 | -GtkEntry-focus-line-width: 0; |
78 | 78 | -GtkScale-focus-line-width: 0; |
79 | 79 | -GtkScale-focus-line-width: 0; |
80 | | -GtkWidget-focus-padding: 3; |
| 80 | -GtkWidget-focus-padding: 0; |
81 | 81 | /* 0.05 works good for both the sugar and sugar-xo themes */ |
82 | 82 | -GtkWidget-cursor-aspect-ratio: 0.05; |
83 | 83 | |
… |
… |
background-color: @black; |
527 | 527 | .toolbar GtkToolButton .button, |
528 | 528 | .toolbar SugarRadioToolButton *, |
529 | 529 | SugarPaletteWindowWidget SugarRadioToolButton *, |
530 | | SugarPaletteWindowWidget GtkToolButton .button{ |
| 530 | SugarPaletteWindowWidget GtkToolButton .button { |
531 | 531 | background-color: transparent; |
532 | 532 | border-radius: $(toolbutton_padding)px; |
533 | | padding: $(default_padding)px; |
| 533 | padding: $(toolbutton_padding)px; |
534 | 534 | } |
535 | 535 | |
536 | 536 | .toolbar GtkToolButton .button:prelight, |