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

Heavy refactoring of palette activation. Not fully

Browse Source 
implemented yet.
master
Marco Pesenti Gritti 17 years ago
parent 400cbc29e5
commit e0793ef199
3 changed files with 93 additions and 194 deletions
Show Stats Download Patch File Download Diff File

52
shell/view/home/HomeBox.py
Unescape Escape View File

@ -135,58 +135,6 @@ class HomeMyIcon(MyIcon):
shutdown_menu_item.connect('activate', self._shutdown_activate_cb)
self._palette.append_menu_item(shutdown_menu_item)
shutdown_menu_item.show()
self.connect('motion-notify-event',self._motion_notify_event_cb)
self._enter_tag = None
self._leave_tag = None
def _motion_notify_event_cb(self, button, event):
if event.detail == hippo.MOTION_DETAIL_ENTER:
gtk.gdk.pointer_ungrab()
if self._leave_tag:
gobject.source_remove(self._leave_tag)
self._leave_tag = None
self._enter_tag = gobject.timeout_add(self._POPUP_PALETTE_DELAY, \
self._show_palette)
elif event.detail == hippo.MOTION_DETAIL_LEAVE:
if self._enter_tag:
gobject.source_remove(self._enter_tag)
self._enter_tag = None
self._leave_tag = gobject.timeout_add(self._POPUP_PALETTE_DELAY,\
self._hide_palette)
return False
def _show_palette(self):
self._palette.popup()
return False
def _hide_palette(self):
# Just hide the palette if the mouse pointer is
# out of the toolbutton and the palette
if self._is_mouse_out(self._palette):
self._palette.popdown()
else:
gtk.gdk.pointer_ungrab()
return False
def _pointer_grab(self):
gtk.gdk.pointer_grab(self.window, owner_events=True,\
event_mask=gtk.gdk.PROPERTY_CHANGE_MASK )
def _is_mouse_out(self, widget):
mouse_x, mouse_y = widget.get_pointer()
event_rect = gtk.gdk.Rectangle(mouse_x, mouse_y, 1, 1)
if widget.allocation.intersect(event_rect).width == 0:
return True
else:
return False
def _shutdown_activate_cb(self, menuitem):
pass

173
sugar/graphics/palette.py
Unescape Escape View File

@ -16,11 +16,12 @@
# Boston, MA 02111-1307, USA.
import gtk
from gtk import gdk, keysyms
import gobject
import time
import hippo
from sugar.graphics import animator
ALIGNMENT_AUTOMATIC = 0
ALIGNMENT_BOTTOM_LEFT = 1
ALIGNMENT_BOTTOM_RIGHT = 2
@ -51,6 +52,14 @@ class Palette(gtk.Window):
self._alignment = ALIGNMENT_AUTOMATIC
self._popup_anim = animator.Animator(0.6, 10)
self._popup_anim.add(_PopupAnimation(self))
self._popup_anim.start()
self._popdown_anim = animator.Animator(0.6, 10)
self._popdown_anim.add(_PopdownAnimation(self))
self._popdown_anim.start()
self._palette_label = gtk.Label()
self._palette_label.show()
@ -75,16 +84,16 @@ class Palette(gtk.Window):
self.add(vbox)
# Widget events
self.connect('enter-notify-event', self._mouse_over_widget_cb)
self.connect('leave-notify-event', self._mouse_out_widget_cb)
self.connect('button-press-event', self._close_palette_cb)
self.connect('key-press-event', self._on_key_press_event_cb)
self.connect('enter-notify-event', self._enter_notify_event_cb)
self.connect('leave-notify-event', self._leave_notify_event_cb)
self.connect('button-press-event', self._button_press_event_cb)
self.set_border_width(self._WIN_BORDER)
def do_set_property(self, pspec, value):
if pspec.name == 'invoker':
self._invoker = value
self._invoker.add_listener(self)
elif pspec.name == 'alignment':
self._alignment = value
else:
@ -119,26 +128,14 @@ class Palette(gtk.Window):
def _try_position(self, alignment):
screen_width = gtk.gdk.screen_width()
screen_height = gtk.gdk.screen_height()
move_x, move_y = self._calc_position(alignment)
x, y = self._calc_position(alignment)
self._width, self._height = self.size_request()
plt_x, plt_y = self.window.get_origin()
if move_x > plt_x:
plt_x += (move_x - plt_x)
else:
plt_x -= (plt_x - move_x)
if move_y > plt_y:
plt_y += (move_y - plt_y)
else:
plt_y -= (plt_y - move_y)
if (plt_x < 0 or plt_x + self._width > screen_width) or \
(plt_y < 0 or plt_y + self._height > screen_height):
if (x + self._width > screen_width) or \
(y + self._height > screen_height):
return False
else:
self.move(move_x, move_y)
self.move(x, y)
self.show()
return True
@ -206,64 +203,75 @@ class Palette(gtk.Window):
self._button_bar.pack_start(button, True, True, self._PADDING)
button.show()
# Display the palette and set the position on the screen
def popup(self):
self.realize()
self.place()
self._popdown_anim.stop()
self._popup_anim.start()
def popdown(self):
gdk.keyboard_ungrab()
self.hide()
self._popup_anim.stop()
self._popdown_anim.start()
# PRIVATE METHODS
def invoker_mouse_enter(self):
self.popup()
# Is the mouse out of the widget ?
def _is_mouse_out(self, widget):
mouse_x, mouse_y = widget.get_pointer()
event_rect = gdk.Rectangle(mouse_x, mouse_y, 1, 1)
def invoker_mouse_leave(self):
self.popdown()
if (self.allocation.intersect(event_rect).width==0):
return True
else:
return False
def _enter_notify_event_cb(self, widget, event):
if event.detail == gtk.gdk.NOTIFY_NONLINEAR:
self._popdown_anim.stop()
# SIGNAL HANDLERS
def _leave_notify_event_cb(self, widget, event):
if event.detail == gtk.gdk.NOTIFY_NONLINEAR:
self.popdown()
# Release the GDK pointer and hide the palette
def _close_palette_cb(self, widget=None, event=None):
self.popdown()
def _button_press_event_cb(self, widget, event):
pass
class _PopupAnimation(animator.Animation):
def __init__(self, palette):
animator.Animation.__init__(self, 0.0, 1.0)
self._palette = palette
def next_frame(self, current):
if current == 1.0:
self._palette.place()
# Mouse is out of the widget
def _mouse_out_widget_cb(self, widget, event):
if (widget == self) and self._is_mouse_out(widget):
self._close_palette_cb()
return
class _PopdownAnimation(animator.Animation):
def __init__(self, palette):
animator.Animation.__init__(self, 0.0, 1.0)
self._palette = palette
gdk.keyboard_grab(self.window, False)
def next_frame(self, current):
if current == 1.0:
self._palette.hide()
# Mouse inside the widget
def _mouse_over_widget_cb(self, widget, event):
gdk.keyboard_ungrab()
class Invoker(object):
def __init__(self):
self._listeners = []
# Some key is pressed
def _on_key_press_event_cb(self, window, event):
# Escape or Alt+Up: Close
# Enter, Return or Space: Select
keyval = event.keyval
state = event.state & gtk.accelerator_get_default_mod_mask()
def add_listener(self, listener):
self._listeners.append(listener)
if (keyval == keysyms.Escape or
((keyval == keysyms.Up or keyval == keysyms.KP_Up) and
state == gdk.MOD1_MASK)):
self._close_palette_cb()
def notify_mouse_enter(self):
for listener in self._listeners:
listener.invoker_mouse_enter()
class WidgetInvoker:
def __init__(self, parent):
self._parent = parent
def notify_mouse_leave(self):
for listener in self._listeners:
listener.invoker_mouse_leave()
class WidgetInvoker(Invoker):
def __init__(self, widget):
Invoker.__init__(self)
self._widget = widget
widget.connect('enter-notify-event', self._enter_notify_event_cb)
widget.connect('leave-notify-event', self._leave_notify_event_cb)
def get_rect(self):
win_x, win_y = self._parent.window.get_origin()
rectangle = self._parent.get_allocation()
win_x, win_y = self._widget.window.get_origin()
rectangle = self._widget.get_allocation()
x = win_x + rectangle.x
y = win_y + rectangle.y
@ -272,30 +280,31 @@ class WidgetInvoker:
return gtk.gdk.Rectangle(x, y, width, height)
# Is mouse over self._parent ?
def is_mouse_over(self):
pointer_x, pointer_y = self._parent.get_pointer()
self._parent_alloc = self._parent.get_allocation()
def _enter_notify_event_cb(self, widget, event):
self.notify_mouse_enter()
pointer_rect = gdk.Rectangle(pointer_x + self._parent_alloc.x, \
pointer_y + self._parent_alloc.y, 1, 1)
def _leave_notify_event_cb(self, widget, event):
self.notify_mouse_leave()
if (self._parent.allocation.intersect(pointer_rect).width == 0):
return False
class CanvasInvoker(Invoker):
def __init__(self, item):
Invoker.__init__(self)
self._item = item
return True
class CanvasInvoker:
def __init__(self, parent):
self._parent = parent
item.connect('motion-notify-event',
self._motion_notify_event_cb)
def get_rect(self):
context = self._parent.get_context()
x, y = context.translate_to_screen(self._parent)
width, height = self._parent.get_allocation()
context = self._item.get_context()
x, y = context.translate_to_screen(self._item)
width, height = self._item.get_allocation()
return gtk.gdk.Rectangle(x, y, width, height)
# Is mouse over self._parent ?
def is_mouse_over(self):
return True
def _motion_notify_event_cb(self, button, event):
if event.detail == hippo.MOTION_DETAIL_ENTER:
self.notify_mouse_enter()
elif event.detail == hippo.MOTION_DETAIL_LEAVE:
self.notify_mouse_leave()
return False

62
sugar/graphics/toolbutton.py
Unescape Escape View File

@ -29,10 +29,6 @@ class ToolButton(gtk.ToolButton):
gtk.ToolButton.__init__(self)
self._palette = None
self.set_icon(icon_name)
self.child.connect('enter-notify-event',self._enter_notify_event_cb)
self.child.connect('leave-notify-event',self._leave_notify_event_cb)
self._enter_tag = None
self._leave_tag = None
def set_icon(self, icon_name):
icon = Icon(icon_name)
@ -41,63 +37,9 @@ class ToolButton(gtk.ToolButton):
def set_palette(self, palette):
self._palette = palette
self._palette.props.invoker = WidgetInvoker(self)
self._palette.props.invoker = WidgetInvoker(self.child)
def set_tooltip(self, text):
if self._palette:
self._palette.destroy()
self._palette = Palette()
self._palette.set_primary_state(text)
self._palette.props.invoker = WidgetInvoker(self)
def _enter_notify_event_cb(self, widget, event):
if not self._palette:
return
gtk.gdk.pointer_ungrab()
if self._leave_tag:
gobject.source_remove(self._leave_tag)
self._leave_tag = None
self._enter_tag = gobject.timeout_add(self._POPUP_PALETTE_DELAY, \
self._show_palette)
def _leave_notify_event_cb(self, widget, event):
if not self._palette:
return
if self._enter_tag:
gobject.source_remove(self._enter_tag)
self._enter_tag = None
self._leave_tag = gobject.timeout_add(self._POPUP_PALETTE_DELAY,\
self._hide_palette)
def _show_palette(self):
self._palette.popup()
return False
def _hide_palette(self):
# Just hide the palette if the mouse pointer is
# out of the toolbutton and the palette
if self._is_mouse_out(self._palette):
self._palette.popdown()
else:
gtk.gdk.pointer_ungrab()
return False
def _pointer_grab(self):
gtk.gdk.pointer_grab(self.window, owner_events=True,\
event_mask=gtk.gdk.PROPERTY_CHANGE_MASK )
def _is_mouse_out(self, widget):
mouse_x, mouse_y = widget.get_pointer()
event_rect = gdk.Rectangle(mouse_x, mouse_y, 1, 1)
if (widget.allocation.intersect(event_rect).width==0):
return True
else:
return False
self._palette.props.invoker = WidgetInvoker(self.child)

Write Preview
Loading…
Cancel
Save