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

Fix review issues

Browse Source
This commit is contained in:
Aleksey Lim 2009-07-31 10:55:58 +00:00
parent 4d6a2cc9bd
commit 3ee78747d4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sugar/graphics/toolbarbox.py
View File

@ -70,7 +70,8 @@ class ToolbarButton(ToolButton):
box = self.toolbar_box box = self.toolbar_box
if not box or not self.page_widget or self.is_expanded() == expanded: if box is None or self.page_widget is None or \
self.is_expanded() == expanded:
return return
if not expanded: if not expanded:
@ -80,11 +81,11 @@ class ToolbarButton(ToolButton):
if box.expanded_button is not None: if box.expanded_button is not None:
expanded_toolitem = box.expanded_button.page_widget.toolbar_button expanded_toolitem = box.expanded_button.page_widget.toolbar_button
if expanded_toolitem.window: if expanded_toolitem.window is not None:
expanded_toolitem.window.invalidate_rect(None, True) expanded_toolitem.window.invalidate_rect(None, True)
box.expanded_button.set_expanded(False) box.expanded_button.set_expanded(False)
if self.page_widget.parent: if self.page_widget.parent is not None:
self.palette.remove(self.page_widget) self.palette.remove(self.page_widget)
self.modify_bg(gtk.STATE_NORMAL, box.background) self.modify_bg(gtk.STATE_NORMAL, box.background)
@ -93,7 +94,8 @@ class ToolbarButton(ToolButton):
box.expanded_button = self box.expanded_button = self
def do_expose_event(self, event): def do_expose_event(self, event):
if not self.is_expanded() or self.palette and self.palette.is_up(): if not self.is_expanded() or self.palette is not None and \
self.palette.is_up():
ToolButton.do_expose_event(self, event) ToolButton.do_expose_event(self, event)
_paint_arrow(self, event, gtk.ARROW_DOWN) _paint_arrow(self, event, gtk.ARROW_DOWN)
return return
@ -247,7 +249,7 @@ class _Palette(gtk.Window):
def do_size_request(self, requisition): def do_size_request(self, requisition):
gtk.Window.do_size_request(self, requisition) gtk.Window.do_size_request(self, requisition)
if self._toolitem.toolbar_box: if self._toolitem.toolbar_box is not None:
requisition.width = self._toolitem.toolbar_box.allocation.width requisition.width = self._toolitem.toolbar_box.allocation.width
def __realize_cb(self, widget): def __realize_cb(self, widget):