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>
This commit is contained in:
Manuel Quiñones 2013-01-10 16:59:49 -03:00
parent 4199c0596b
commit d32523655c

View File

@ -272,6 +272,8 @@ class _Box(Gtk.EventBox):
self._toolbar_button = toolbar_button self._toolbar_button = toolbar_button
def do_draw(self, cr): def do_draw(self, cr):
self.get_child().do_draw(self, cr)
button_alloc = self._toolbar_button.get_allocation() button_alloc = self._toolbar_button.get_allocation()
cr.set_line_width(style.FOCUS_LINE_WIDTH * 2) 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.line_to(self.get_allocation().width, 0)
cr.stroke() cr.stroke()
self.get_child().do_draw(self, cr)
def _setup_page(page_widget, color, hpad): def _setup_page(page_widget, color, hpad):
vpad = style.FOCUS_LINE_WIDTH page_widget.get_child().set_padding(0, 0, hpad, hpad)
page_widget.get_child().set_padding(vpad, vpad, hpad, hpad)
page = _get_embedded_page(page_widget) page = _get_embedded_page(page_widget)
page.modify_bg(Gtk.StateType.NORMAL, color) page.modify_bg(Gtk.StateType.NORMAL, color)