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

Place palettes at cursor for free views.

Browse Source
master
Marco Pesenti Gritti 17 years ago
parent de2d4ef43b
commit daa95aadd7
4 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File

1
NEWS
Unescape Escape View File

@ -1,3 +1,4 @@
* #2008 Place free views palettes at cursor. (marco)
* Actually handle multiple mime types (dcbw)
* Keep owner in the center in mesh view (dcbw)
* Suppress annoying warnings about unknown activities from the PS (dcbw)

4
shell/view/frame/frameinvoker.py
Unescape Escape View File

@ -18,12 +18,16 @@
import gtk
from sugar.graphics import units
from sugar.graphics.palette import Palette
from sugar.graphics.palette import CanvasInvoker
class FrameCanvasInvoker(CanvasInvoker):
def __init__(self, item):
CanvasInvoker.__init__(self, item)
def get_default_position(self):
return Palette.AROUND
def get_screen_area(self):
x = units.grid_to_pixels(1)
y = units.grid_to_pixels(1)

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

@ -135,13 +135,15 @@ class HomeMyIcon(MyIcon):
self._shell = shell
def enable_palette(self):
self.set_tooltip(profile.get_nick_name())
palette = Palette(profile.get_nick_name())
shutdown_menu_item = gtk.MenuItem(_('Shutdown'))
shutdown_menu_item.connect('activate', self._shutdown_activate_cb)
self.get_palette().append_menu_item(shutdown_menu_item)
palette.append_menu_item(shutdown_menu_item)
shutdown_menu_item.show()
self.set_palette(palette)
def _shutdown_activate_cb(self, menuitem):
model = self._shell.get_model()
model.props.state = ShellModel.STATE_SHUTDOWN

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

@ -37,11 +37,13 @@ _TOP_LEFT = 6
_TOP_RIGHT = 7
class Palette(gobject.GObject):
AUTOMATIC = 0
BOTTOM = 1
LEFT = 2
RIGHT = 3
TOP = 4
DEFAULT = 0
AT_CURSOR = 1
AROUND = 2
BOTTOM = 3
LEFT = 4
RIGHT = 5
TOP = 6
__gtype_name__ = 'SugarPalette'
@ -65,13 +67,13 @@ class Palette(gobject.GObject):
self._invoker = None
self._group_id = None
self._up = False
self._position = self.AUTOMATIC
self._position = self.DEFAULT
self._palette_popup_sid = None
self._popup_anim = animator.Animator(0.3, 10)
self._popup_anim.add(_PopupAnimation(self))
self._secondary_anim = animator.Animator(1.3, 10)
self._secondary_anim = animator.Animator(1.0, 10)
self._secondary_anim.add(_SecondaryAnimation(self))
self._popdown_anim = animator.Animator(0.6, 10)
@ -97,8 +99,6 @@ class Palette(gobject.GObject):
self._enter_notify_event_cb)
self._menu.connect('leave-notify-event',
self._leave_notify_event_cb)
self._menu.connect('button-press-event',
self._button_press_event_cb)
def is_up(self):
return self._up
@ -162,9 +162,10 @@ class Palette(gobject.GObject):
else:
raise AssertionError
def _get_position(self, alignment):
def _get_position(self, alignment, inv_rect=None):
# Invoker: x, y, width and height
inv_rect = self._invoker.get_rect()
if inv_rect == None:
inv_rect = self._invoker.get_rect()
palette_width, palette_height = self._menu.size_request()
if alignment == _BOTTOM_LEFT:
@ -203,14 +204,14 @@ class Palette(gobject.GObject):
x + width <= screen_area.width and \
y + height <= screen_area.height
def _get_automatic_position(self):
def _get_automatic_position(self, inv_rect=None):
alignments = [ _BOTTOM_LEFT, _BOTTOM_RIGHT,
_LEFT_BOTTOM, _LEFT_TOP,
_RIGHT_BOTTOM, _RIGHT_TOP,
_TOP_LEFT, _TOP_RIGHT ]
for alignment in alignments:
x, y = self._get_position(alignment)
x, y = self._get_position(alignment, inv_rect)
if self._in_screen(x, y):
return x, y
@ -218,23 +219,36 @@ class Palette(gobject.GObject):
return (0, 0)
def _show(self):
if self._up:
return
x = y = 0
if self._position == self.AUTOMATIC:
if self._position == self.DEFAULT:
position = self._invoker.get_default_position()
else:
position = self._position
if position == self.AT_CURSOR:
display = gtk.gdk.display_get_default()
screen, x, y, mask = display.get_pointer()
rect = gtk.gdk.Rectangle(x, y, 0, 0)
x, y = self._get_automatic_position(rect)
elif position == self.AROUND:
x, y = self._get_automatic_position()
elif self._position == self.BOTTOM:
elif position == self.BOTTOM:
x, y = self._get_position(_BOTTOM_LEFT)
if not self._in_screen(x, y):
x, y = self._get_position(_BOTTOM_RIGHT)
elif self._position == self.LEFT:
elif position == self.LEFT:
x, y = self._get_position(_LEFT_BOTTOM)
if not self._in_screen(x, y):
x, y = self._get_position(_LEFT_TOP)
elif self._position == self.RIGHT:
elif position == self.RIGHT:
x, y = self._get_position(_RIGHT_BOTTOM)
if not self._in_screen(x, y):
x, y = self._get_position(_RIGHT_TOP)
elif self._position == self.TOP:
elif position == self.TOP:
x, y = self._get_position(_TOP_LEFT)
if not self._in_screen(x, y):
x, y = self._get_position(_TOP_RIGHT)
@ -284,14 +298,12 @@ class Palette(gobject.GObject):
def _enter_notify_event_cb(self, widget, event):
if event.detail == gtk.gdk.NOTIFY_NONLINEAR:
self._popdown_anim.stop()
self._secondary_anim.start()
def _leave_notify_event_cb(self, widget, event):
if event.detail == gtk.gdk.NOTIFY_NONLINEAR:
self.popdown()
def _button_press_event_cb(self, widget, event):
pass
def _palette_observer_popup_cb(self, observer, palette):
if self != palette:
self._hide()
@ -401,6 +413,9 @@ class Invoker(gobject.GObject):
def __init__(self):
gobject.GObject.__init__(self)
def get_default_position(self):
return Palette.AROUND
def get_screen_area(self):
width = gtk.gdk.screen_width()
height = gtk.gdk.screen_height()
@ -449,6 +464,9 @@ class CanvasInvoker(Invoker):
item.connect('motion-notify-event',
self._motion_notify_event_cb)
def get_default_position(self):
return Palette.AT_CURSOR
def get_rect(self):
context = self._item.get_context()
if context:

Write Preview
Loading…
Cancel
Save