Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel QuiƱones <manuq@laptop.org>2013-01-10 19:59:49 (GMT)
committer Ajay Garg <ajay@activitycentral.com>2013-01-31 06:56:43 (GMT)
commite37915bd7b50d752652bed78ef63a604e735c140 (patch)
tree3b090d0c7c2206d978fb486a6cd62e8b81668ed1
parent4f2acacc2414173a20965053e1dfa737cebfe8d2 (diff)
Fix subtoolbars height - SL #4019
Remove the vertical padding from the box that contain the toolbar, and change the order of drawings in the container widget so that the outline looks right. This has been tested with screenshots, see the gif animation attached to the ticket. Signed-off-by: Manuel QuiƱones <manuq@laptop.org> Acked-by: Simon Schampijer <simon@laptop.org> Signed-off-by: Ajay Garg <ajay@activitycentral.com>
-rw-r--r--src/sugar3/graphics/toolbarbox.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/sugar3/graphics/toolbarbox.py b/src/sugar3/graphics/toolbarbox.py
index 8c4e644..c20f326 100644
--- a/src/sugar3/graphics/toolbarbox.py
+++ b/src/sugar3/graphics/toolbarbox.py
@@ -272,6 +272,8 @@ class _Box(Gtk.EventBox):
self._toolbar_button = toolbar_button
def do_draw(self, cr):
+ self.get_child().do_draw(self, cr)
+
button_alloc = self._toolbar_button.get_allocation()
cr.set_line_width(style.FOCUS_LINE_WIDTH * 2)
@@ -282,12 +284,9 @@ class _Box(Gtk.EventBox):
cr.line_to(self.get_allocation().width, 0)
cr.stroke()
- self.get_child().do_draw(self, cr)
-
def _setup_page(page_widget, color, hpad):
- vpad = style.FOCUS_LINE_WIDTH
- page_widget.get_child().set_padding(vpad, vpad, hpad, hpad)
+ page_widget.get_child().set_padding(0, 0, hpad, hpad)
page = _get_embedded_page(page_widget)
page.modify_bg(Gtk.StateType.NORMAL, color)