Ticket #3565: 3565-preliminar.patch

File 3565-preliminar.patch, 3.1 KB (added by manuq, 12 years ago)

Preliminar patch

  • src/sugar3/graphics/tray.py

    diff --git a/src/sugar3/graphics/tray.py b/src/sugar3/graphics/tray.py
    index 82e1d97..e9b7a0d 100644
    a b class _TrayViewport(Gtk.Viewport): 
    4646        self._can_scroll_next = False
    4747        self._can_scroll_prev = False
    4848
    49         GObject.GObject.__init__(self)
     49        Gtk.Viewport.__init__(self)
    5050
    5151        self.set_shadow_type(Gtk.ShadowType.NONE)
    5252
    class _TrayViewport(Gtk.Viewport): 
    169169
    170170class _TrayScrollButton(ToolButton):
    171171
     172    __gtype_name__ = 'SugarTrayScrollButton'
     173
    172174    def __init__(self, icon_name, scroll_direction):
    173175        ToolButton.__init__(self)
    174176        self._viewport = None
    ALIGN_TO_START = 0 
    223225ALIGN_TO_END = 1
    224226
    225227
    226 class HTray(Gtk.HBox):
     228class HTray(Gtk.EventBox):
    227229
    228230    __gtype_name__ = 'SugarHTray'
    229231
    class HTray(Gtk.HBox): 
    237239        self._drag_active = False
    238240        self.align = ALIGN_TO_START
    239241
    240         GObject.GObject.__init__(self, **kwargs)
     242        Gtk.EventBox.__init__(self, **kwargs)
     243
     244        self._box = Gtk.HBox()
     245        self.add(self._box)
    241246
    242247        scroll_left = _TrayScrollButton('go-left', _PREVIOUS_PAGE)
    243         self.pack_start(scroll_left, False, False, 0)
     248        self._box.pack_start(scroll_left, False, False, 0)
    244249
    245250        self._viewport = _TrayViewport(Gtk.Orientation.HORIZONTAL)
    246         self.pack_start(self._viewport, True, True, 0)
     251        self._box.pack_start(self._viewport, True, True, 0)
    247252        self._viewport.show()
    248253
    249254        scroll_right = _TrayScrollButton('go-right', _NEXT_PAGE)
    250         self.pack_start(scroll_right, False, False, 0)
     255        self._box.pack_start(scroll_right, False, False, 0)
    251256
    252257        scroll_left.viewport = self._viewport
    253258        scroll_right.viewport = self._viewport
    class HTray(Gtk.HBox): 
    309314        self._viewport.scroll_to_item(item)
    310315
    311316
    312 class VTray(Gtk.VBox):
     317class VTray(Gtk.EventBox):
    313318
    314319    __gtype_name__ = 'SugarVTray'
    315320
    class VTray(Gtk.VBox): 
    323328        self._drag_active = False
    324329        self.align = ALIGN_TO_START
    325330
    326         GObject.GObject.__init__(self, **kwargs)
     331        Gtk.EventBox.__init__(self, **kwargs)
     332
     333        self._box = Gtk.HBox()
     334        self.add(self._box)
    327335
    328336        scroll_up = _TrayScrollButton('go-up', _PREVIOUS_PAGE)
    329         self.pack_start(scroll_up, False, False, 0)
     337        self._box.pack_start(scroll_up, False, False, 0)
    330338
    331339        self._viewport = _TrayViewport(Gtk.Orientation.VERTICAL)
    332         self.pack_start(self._viewport, True, True, 0)
     340        self._box.pack_start(self._viewport, True, True, 0)
    333341        self._viewport.show()
    334342
    335343        scroll_down = _TrayScrollButton('go-down', _NEXT_PAGE)
    336         self.pack_start(scroll_down, False, False, 0)
     344        self._box.pack_start(scroll_down, False, False, 0)
    337345
    338346        scroll_up.viewport = self._viewport
    339347        scroll_down.viewport = self._viewport
    class _IconWidget(Gtk.EventBox): 
    406414    __gtype_name__ = 'SugarTrayIconWidget'
    407415
    408416    def __init__(self, icon_name=None, xo_color=None):
    409         GObject.GObject.__init__(self)
     417        Gtk.EventBox.__init__(self)
    410418
    411419        self.set_app_paintable(True)
    412420