sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use padding property for top toolbar and all sub-widgets

Browse Source
This commit is contained in:
Aleksey Lim 2009-07-12 04:32:51 +00:00
parent e256b96366
commit 82785558d4
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/sugar/graphics/toolbar.py
View File

@ -44,10 +44,10 @@ class ToolbarButton(ToolButton):
toolbar = property(get_toolbar) toolbar = property(get_toolbar)
def get_page(self): def get_page(self):
return self._page.get_child() return self._page.child.child
def set_page(self, page): def set_page(self, page):
self._page = _align(_Box, page, 0, style._FOCUS_LINE_WIDTH*3) self._page = _align(_Box, page)
self._page._toolitem = self self._page._toolitem = self
page.show() page.show()
@ -77,15 +77,11 @@ class ToolbarButton(ToolButton):
self.modify_bg(gtk.STATE_NORMAL, self.toolbar._bg) self.modify_bg(gtk.STATE_NORMAL, self.toolbar._bg)
self._page._toolitem_alloc = self.allocation
self.toolbar._expand_page(self._page) self.toolbar._expand_page(self._page)
expanded = property(get_expanded, set_expanded) expanded = property(get_expanded, set_expanded)
def do_expose_event(self, event): def do_expose_event(self, event):
child = self.get_child()
alloc = self.allocation
if not self.expanded or self.palette and self.palette.is_up(): if not self.expanded or self.palette and self.palette.is_up():
ToolButton.do_expose_event(self, event) ToolButton.do_expose_event(self, event)
if self.palette and self.palette.is_up(): if self.palette and self.palette.is_up():
@ -94,12 +90,14 @@ class ToolbarButton(ToolButton):
_paint_arrow(self, event, gtk.ARROW_UP) _paint_arrow(self, event, gtk.ARROW_UP)
return return
alloc = self.allocation
self.get_style().paint_box(event.window, self.get_style().paint_box(event.window,
gtk.STATE_NORMAL, gtk.SHADOW_IN, event.area, self, gtk.STATE_NORMAL, gtk.SHADOW_IN, event.area, self,
'palette-invoker', alloc.x, 0, 'palette-invoker', alloc.x, 0,
alloc.width, alloc.height + style._FOCUS_LINE_WIDTH) alloc.width, alloc.height + style._FOCUS_LINE_WIDTH)
if child.state != gtk.STATE_PRELIGHT: if self.child.state != gtk.STATE_PRELIGHT:
self.get_style().paint_box(event.window, self.get_style().paint_box(event.window,
gtk.STATE_NORMAL, gtk.SHADOW_NONE, event.area, self, None, gtk.STATE_NORMAL, gtk.SHADOW_NONE, event.area, self, None,
alloc.x + style._FOCUS_LINE_WIDTH, style._FOCUS_LINE_WIDTH, alloc.x + style._FOCUS_LINE_WIDTH, style._FOCUS_LINE_WIDTH,
@ -113,14 +111,16 @@ class Toolbar(gtk.VBox):
'current-toolbar-changed': (SIGNAL_RUN_FIRST, TYPE_NONE, ([int])) 'current-toolbar-changed': (SIGNAL_RUN_FIRST, TYPE_NONE, ([int]))
} }
def __init__(self, hpad=style.TOOLBOX_HORIZONTAL_PADDING): def __init__(self, padding=style.TOOLBOX_HORIZONTAL_PADDING):
gtk.VBox.__init__(self) gtk.VBox.__init__(self)
self._top = gtk.Toolbar() self._top = gtk.Toolbar()
self._top.owner = self self._top.owner = self
self._top_widget = _align(gtk.EventBox, self._top, hpad, 0)
self.pack_start(self._top_widget)
top_widget = _align(gtk.EventBox, self._top)
self.pack_start(top_widget)
self.props.padding = padding
self.modify_bg(gtk.STATE_NORMAL, self.modify_bg(gtk.STATE_NORMAL,
style.COLOR_TOOLBAR_GREY.get_gdk_color()) style.COLOR_TOOLBAR_GREY.get_gdk_color())
@ -136,10 +136,19 @@ class Toolbar(gtk.VBox):
top = property(lambda self: self._top) top = property(lambda self: self._top)
def get_padding(self):
return self._top.parent.props.left_padding
def set_padding(self, pad):
self._top.parent.set_padding(0, 0, pad, pad)
padding = gobject.property(type=object,
getter=get_padding, setter=set_padding)
def modify_bg(self, state, color): def modify_bg(self, state, color):
if state == gtk.STATE_NORMAL: if state == gtk.STATE_NORMAL:
self._bg = color self._bg = color
self._top_widget.modify_bg(state, color) self._top.parent.parent.modify_bg(state, color)
self._top.modify_bg(state, color) self._top.modify_bg(state, color)
def _remove_cb(self, sender, widget): def _remove_cb(self, sender, widget):
@ -165,19 +174,21 @@ class Toolbar(gtk.VBox):
def _expand_page(self, page): def _expand_page(self, page):
for i in range(self._notebook.get_n_pages()): for i in range(self._notebook.get_n_pages()):
self._notebook.remove_page(0) self._notebook.remove_page(0)
_modify_bg(page, self._bg)
_setup_page(page, self._bg, self.props.padding)
self._notebook.append_page(page) self._notebook.append_page(page)
if self._notebook.parent is None: if self._notebook.parent is None:
self.pack_start(self._notebook) self.pack_start(self._notebook)
class _Box(gtk.EventBox): class _Box(gtk.EventBox):
def __init__(self): def __init__(self):
gtk.EventBox.__init__(self) gtk.EventBox.__init__(self)
self._toolitem_alloc = gtk.gdk.Rectangle()
self.connect('expose-event', self.do_expose_event) self.connect('expose-event', self.do_expose_event)
self.set_app_paintable(True) self.set_app_paintable(True)
def do_expose_event(self, widget, event): def do_expose_event(self, widget, event):
a = self._toolitem.allocation
self.get_style().paint_box(event.window, self.get_style().paint_box(event.window,
gtk.STATE_NORMAL, gtk.SHADOW_IN, event.area, self, gtk.STATE_NORMAL, gtk.SHADOW_IN, event.area, self,
'palette-invoker', -style._FOCUS_LINE_WIDTH, 0, 'palette-invoker', -style._FOCUS_LINE_WIDTH, 0,
@ -185,9 +196,8 @@ class _Box(gtk.EventBox):
self.allocation.height + style._FOCUS_LINE_WIDTH) self.allocation.height + style._FOCUS_LINE_WIDTH)
self.get_style().paint_box(event.window, self.get_style().paint_box(event.window,
gtk.STATE_NORMAL, gtk.SHADOW_NONE, event.area, self, None, gtk.STATE_NORMAL, gtk.SHADOW_NONE, event.area, self, None,
self._toolitem_alloc.x + style._FOCUS_LINE_WIDTH, 0, a.x + style._FOCUS_LINE_WIDTH, 0,
self._toolitem_alloc.width - style._FOCUS_LINE_WIDTH*2, a.width - style._FOCUS_LINE_WIDTH*2, style._FOCUS_LINE_WIDTH)
style._FOCUS_LINE_WIDTH)
class _Palette(gtk.Window): class _Palette(gtk.Window):
def __init__(self, toolitem, **kwargs): def __init__(self, toolitem, **kwargs):
@ -277,9 +287,9 @@ class _Palette(gtk.Window):
if not self._invoker or self._toolitem.expanded or not toolbar: if not self._invoker or self._toolitem.expanded or not toolbar:
return return
page._toolitem_alloc = self._toolitem.allocation _setup_page(page, style.COLOR_BLACK.get_gdk_color(),
_modify_bg(page, style.COLOR_BLACK.get_gdk_color()) toolbar.props.padding)
if self.get_child() is None: if self.child is None:
self.add(page) self.add(page)
x, y = toolbar.window.get_origin() x, y = toolbar.window.get_origin()
@ -338,29 +348,22 @@ class _Palette(gtk.Window):
self._invoker.notify_popdown() self._invoker.notify_popdown()
self._up = False self._up = False
def _modify_bg(page, color): def _setup_page(page, color, hpad):
child = page.get_child() vpad = style._FOCUS_LINE_WIDTH*3
if isinstance(child, gtk.Alignment): page.child.set_padding(vpad, vpad, hpad, hpad)
child = child.get_child() page.child.child.modify_bg(gtk.STATE_NORMAL, color)
child.modify_bg(gtk.STATE_NORMAL, color)
page.modify_bg(gtk.STATE_NORMAL, color) page.modify_bg(gtk.STATE_NORMAL, color)
page.modify_bg(gtk.STATE_PRELIGHT, color) page.modify_bg(gtk.STATE_PRELIGHT, color)
def _align(box_class, widget, hpad, vpad): def _align(box_class, widget):
if hpad or vpad: widget.show()
top_pad = vpad alignment = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
bottom_pad = vpad and vpad - style._FOCUS_LINE_WIDTH alignment.add(widget)
alignment = gtk.Alignment(0.0, 0.0, 1.0, 1.0) alignment.show()
alignment.set_padding(top_pad, bottom_pad, hpad, hpad)
alignment.add(widget)
alignment.show()
widget = alignment
box = box_class() box = box_class()
box.modify_bg(gtk.STATE_ACTIVE, style.COLOR_BUTTON_GREY.get_gdk_color()) box.modify_bg(gtk.STATE_ACTIVE, style.COLOR_BUTTON_GREY.get_gdk_color())
box.add(widget) box.add(alignment)
box.show() box.show()
return box return box
def _paint_arrow(widget, event, type): def _paint_arrow(widget, event, type):