diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2009-08-01 11:34:45 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-08-01 11:34:45 (GMT) |
| commit | e799649f2ffbf1da08c9b89a30524c35b21a31e6 (patch) | |
| tree | e88a3dc1fe01d128ec116accf50f9916304d1bd8 | |
| parent | f5f8c807d3c4fc7cf6113996e77cea920598bfa4 (diff) | |
Fix merger artefacts
| -rw-r--r-- | src/sugar/graphics/toolbarbox.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sugar/graphics/toolbarbox.py b/src/sugar/graphics/toolbarbox.py index f9fe73e..93c2496 100644 --- a/src/sugar/graphics/toolbarbox.py +++ b/src/sugar/graphics/toolbarbox.py @@ -124,7 +124,7 @@ class ToolbarButton(ToolButton): self.get_style().paint_box(event.window, gtk.STATE_NORMAL, gtk.SHADOW_NONE, event.area, self, None, alloc.x + style.FOCUS_LINE_WIDTH, style.FOCUS_LINE_WIDTH, - alloc.width - style.FOCUS_LINE_WIDTH*2, alloc.height) + alloc.width - style.FOCUS_LINE_WIDTH * 2, alloc.height) gtk.ToolButton.do_expose_event(self, event) _paint_arrow(self, event, gtk.ARROW_UP) @@ -239,17 +239,17 @@ class _Box(gtk.EventBox): alloc = self.toolbar_button.allocation self.get_style().paint_box(event.window, gtk.STATE_NORMAL, gtk.SHADOW_IN, event.area, self, - 'palette-invoker', -style._FOCUS_LINE_WIDTH, 0, - self.allocation.width + style._FOCUS_LINE_WIDTH*2, - self.allocation.height + style._FOCUS_LINE_WIDTH) + 'palette-invoker', -style.FOCUS_LINE_WIDTH, 0, + self.allocation.width + style.FOCUS_LINE_WIDTH * 2, + self.allocation.height + style.FOCUS_LINE_WIDTH) self.get_style().paint_box(event.window, gtk.STATE_NORMAL, gtk.SHADOW_NONE, event.area, self, None, - alloc.x + style._FOCUS_LINE_WIDTH, 0, - alloc.width - style._FOCUS_LINE_WIDTH*2, - style._FOCUS_LINE_WIDTH) + alloc.x + style.FOCUS_LINE_WIDTH, 0, + alloc.width - style.FOCUS_LINE_WIDTH * 2, + style.FOCUS_LINE_WIDTH) def _setup_page(page_widget, color, hpad): - vpad = style._FOCUS_LINE_WIDTH + vpad = style.FOCUS_LINE_WIDTH page_widget.child.set_padding(vpad, vpad, hpad, hpad) page = page_widget.child.child |