Start moving to hippo canvas. (Friends presence in the activity regressed)
parent
d05f1f13d3
commit
0a912e214a
@ -1,27 +1,24 @@
|
||||
import gtk
|
||||
import goocanvas
|
||||
|
||||
from sugar.canvas.CanvasView import CanvasView
|
||||
import hippo
|
||||
|
||||
class PanelWindow(gtk.Window):
|
||||
def __init__(self, grid, model, x, y, width, height):
|
||||
def __init__(self):
|
||||
gtk.Window.__init__(self)
|
||||
|
||||
self._grid = grid
|
||||
|
||||
self.set_decorated(False)
|
||||
self.connect('realize', self._realize_cb)
|
||||
|
||||
self.realize()
|
||||
self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
|
||||
self.window.set_accept_focus(False)
|
||||
canvas = hippo.Canvas()
|
||||
|
||||
screen = gtk.gdk.screen_get_default()
|
||||
self.window.set_transient_for(screen.get_root_window())
|
||||
self._bg = hippo.CanvasBox(background_color=0x4f4f4fff)
|
||||
canvas.set_root(self._bg)
|
||||
|
||||
view = CanvasView()
|
||||
view.show()
|
||||
self.add(view)
|
||||
view.set_model(model)
|
||||
self.add(canvas)
|
||||
canvas.show()
|
||||
|
||||
self._grid.set_constraints(self, x, y, width, height)
|
||||
self._grid.set_constraints(view, x, y, width, height)
|
||||
def get_root(self):
|
||||
return self._bg
|
||||
|
||||
def _realize_cb(self, widget):
|
||||
self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
|
||||
self.window.set_accept_focus(False)
|
||||
|
@ -0,0 +1,20 @@
|
||||
import gtk
|
||||
|
||||
from sugar.graphics import style
|
||||
from sugar.canvas.IconColor import IconColor
|
||||
|
||||
if gtk.gdk.screen_width() == 1200:
|
||||
_medium_icon_size = 75
|
||||
else:
|
||||
_medium_icon_size = 50
|
||||
|
||||
_stylesheet = {
|
||||
'color' : IconColor('white'),
|
||||
'size' : _medium_icon_size
|
||||
}
|
||||
style.register_stylesheet('frame-activity-icon', _stylesheet)
|
||||
|
||||
_stylesheet = {
|
||||
'size' : _medium_icon_size
|
||||
}
|
||||
style.register_stylesheet('frame-zoom-icon', _stylesheet)
|
@ -0,0 +1,113 @@
|
||||
import hippo
|
||||
import gobject
|
||||
|
||||
from sugar.graphics.canvasicon import CanvasIcon
|
||||
|
||||
class _MenuStrategy:
|
||||
def get_menu_position(self, menu, grid_x1, grid_y1, grid_x2, grid_y2):
|
||||
grid_x = grid_x2
|
||||
if grid_x + menu.get_width() > Grid.COLS:
|
||||
grid_x = grid_x1 - menu.get_width() + 1
|
||||
|
||||
grid_y = grid_y1
|
||||
|
||||
if grid_y < 0:
|
||||
grid_y = 0
|
||||
if grid_y + menu.get_width() > Grid.ROWS:
|
||||
grid_y = Grid.ROWS - menu.get_width()
|
||||
|
||||
return [grid_x, grid_y]
|
||||
|
||||
class MenuIcon(CanvasIcon):
|
||||
def __init__(self, menu_shell, **kwargs):
|
||||
CanvasIcon.__init__(self, **kwargs)
|
||||
|
||||
self._menu_shell = menu_shell
|
||||
self._grid = menu_shell.get_grid()
|
||||
self._menu = None
|
||||
self._hover_menu = False
|
||||
self._popdown_on_leave = False
|
||||
self._popdown_sid = 0
|
||||
self._menu_strategy = _MenuStrategy()
|
||||
|
||||
self.connect('motion-notify-event', self._motion_notify_event_cb)
|
||||
|
||||
def popdown(self):
|
||||
if self._menu:
|
||||
self._menu.destroy()
|
||||
self._menu = None
|
||||
self._menu_shell.set_active(None)
|
||||
|
||||
def set_menu_strategy(self, strategy):
|
||||
self._menu_strategy = strategy
|
||||
|
||||
def _popup(self, x1, y1, x2, y2):
|
||||
self.popdown()
|
||||
|
||||
self._menu_shell.set_active(None)
|
||||
|
||||
grid = self._shell.get_grid()
|
||||
self._menu = self.create_menu()
|
||||
self._menu.connect('enter-notify-event',
|
||||
self._menu_enter_notify_event_cb)
|
||||
self._menu.connect('leave-notify-event',
|
||||
self._menu_leave_notify_event_cb)
|
||||
|
||||
[grid_x1, grid_y1] = grid.convert_from_screen(x1, y1)
|
||||
[grid_x2, grid_y2] = grid.convert_from_screen(x2, y2)
|
||||
|
||||
strategy = self._menu_strategy
|
||||
[grid_x, grid_y] = strategy.get_menu_position(self._menu,
|
||||
grid_x1, grid_y1,
|
||||
grid_x2, grid_y2)
|
||||
|
||||
grid.set_constraints(self._menu, grid_x, grid_y,
|
||||
self._menu.get_width(), self._menu.get_height())
|
||||
|
||||
self._menu.show()
|
||||
|
||||
self._menu_shell.set_active(self)
|
||||
|
||||
def _menu_enter_notify_event_cb(self, widget, event):
|
||||
self._hover_menu = True
|
||||
|
||||
def _menu_leave_notify_event_cb(self, widget, event):
|
||||
self._hover_menu = False
|
||||
if self._popdown_on_leave:
|
||||
self.popdown()
|
||||
|
||||
def _start_popdown_timeout(self):
|
||||
self._stop_popdown_timeout()
|
||||
self._popdown_sid = gobject.timeout_add(1000, self._popdown_timeout_cb)
|
||||
|
||||
def _stop_popdown_timeout(self):
|
||||
if self._popdown_sid > 0:
|
||||
gobject.source_remove(self._popdown_sid)
|
||||
self._popdown_sid = 0
|
||||
|
||||
def _motion_notify_event_cb(self, item, event):
|
||||
if event.detail == hippo.MOTION_DETAIL_ENTER:
|
||||
self._motion_notify_enter()
|
||||
elif event.detail == hippo.MOTION_DETAIL_LEAVE:
|
||||
self._motion_notify_leave()
|
||||
|
||||
def _motion_notify_enter(self):
|
||||
self._stop_popdown_timeout()
|
||||
|
||||
[x, y] = self.get_context().translate_to_widget(self)
|
||||
[width, height] = self.get_allocation()
|
||||
|
||||
self._popup(x, y, width, height)
|
||||
|
||||
def _motion_notify_leave(self):
|
||||
self._start_popdown_timeout()
|
||||
|
||||
def _popdown_timeout_cb(self):
|
||||
self._popdown_sid = 0
|
||||
|
||||
if not self._hover_menu:
|
||||
self.popdown()
|
||||
else:
|
||||
self._popdown_on_leave = True
|
||||
|
||||
return False
|
@ -1,13 +1,10 @@
|
||||
_styles = {}
|
||||
|
||||
def register_style(name, style):
|
||||
def register_stylesheet(name, style):
|
||||
_styles[name] = style
|
||||
|
||||
def apply_style(name, item):
|
||||
if _styles.has_key(name):
|
||||
for name in _styles.keys():
|
||||
item.set_property(name, _styles[name]
|
||||
|
||||
def Style(dict):
|
||||
def set_property(self, name, value):
|
||||
self._properties[name] = value
|
||||
def apply_stylesheet(item, stylesheet_name):
|
||||
if _styles.has_key(stylesheet_name):
|
||||
style_sheet = _styles[stylesheet_name]
|
||||
for name in style_sheet.keys():
|
||||
item.set_property(name, style_sheet[name])
|
||||
|
Loading…
Reference in New Issue