Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Collazo <scollazo@activitycentral.com>2013-01-31 11:43:57 (GMT)
committer Santiago Collazo <scollazo@activitycentral.com>2013-01-31 11:43:57 (GMT)
commitd1f473718e701c6451277938c5ff8b6700d98d7d (patch)
tree11d6a2141f3903da3ad2343a646418286a18aa94
parent3beab76c44499431551886724aca491ebb75d858 (diff)
parente37915bd7b50d752652bed78ef63a604e735c140 (diff)
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
-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)