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

Palette positioning/closing fixes

Browse Source
This commit is contained in:
Eduardo Silva 2007-06-06 17:21:33 -04:00
parent 129ada9101
commit fde3159002
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sugar/graphics/palette.py
View File

@ -19,7 +19,7 @@
import gtk import gtk
from gtk import gdk, keysyms from gtk import gdk, keysyms
import gobject import gobject
import pango import time
ALIGNMENT_AUTOMATIC = 0 ALIGNMENT_AUTOMATIC = 0
ALIGNMENT_BOTTOM_LEFT = 1 ALIGNMENT_BOTTOM_LEFT = 1
@ -45,6 +45,7 @@ class Palette(gtk.Window):
_PADDING = 1 _PADDING = 1
_WIN_BORDER = 5 _WIN_BORDER = 5
_POPUP_PALETTE_DELAY = 0.15
def __init__(self, **kwargs): def __init__(self, **kwargs):
gobject.GObject.__init__(self, type=gtk.WINDOW_POPUP, **kwargs) gobject.GObject.__init__(self, type=gtk.WINDOW_POPUP, **kwargs)
@ -58,7 +59,7 @@ class Palette(gtk.Window):
vbox = gtk.VBox(False, 0) vbox = gtk.VBox(False, 0)
vbox.pack_start(self._palette_label, True, True, self._PADDING) vbox.pack_start(self._palette_label, True, True, self._PADDING)
# If it's a tooltip palette.. # tooltip palette ?
if not self._is_tooltip: if not self._is_tooltip:
self._separator = gtk.HSeparator() self._separator = gtk.HSeparator()
self._separator.hide() self._separator.hide()
@ -90,7 +91,6 @@ class Palette(gtk.Window):
self.set_border_width(self._WIN_BORDER) self.set_border_width(self._WIN_BORDER)
self._width, self._height = self.size_request()
self._scr_width = gtk.gdk.screen_width() self._scr_width = gtk.gdk.screen_width()
self._scr_height = gtk.gdk.screen_height() self._scr_height = gtk.gdk.screen_height()
@ -132,12 +132,25 @@ class Palette(gtk.Window):
def _try_position(self, alignment): def _try_position(self, alignment):
move_x, move_y = self._calc_position(alignment) move_x, move_y = self._calc_position(alignment)
self.move(move_x, move_y) self._width, self._height = self.size_request()
plt_x, plt_y = self.window.get_origin() 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>self._scr_width) or (plt_y<0 or plt_y+self._height>self._scr_height): if (plt_x<0 or plt_x+self._width>self._scr_width) or (plt_y<0 or plt_y+self._height>self._scr_height):
return False return False
else: else:
self.move(move_x, move_y)
self.show()
return True return True
def _calc_position(self, alignment): def _calc_position(self, alignment):
@ -214,18 +227,18 @@ class Palette(gtk.Window):
if (self._parent_widget.allocation.intersect(pointer_rect).width == 0): if (self._parent_widget.allocation.intersect(pointer_rect).width == 0):
return return
self.show() self.realize()
self.set_position() self.set_position()
self._pointer_grab() self._pointer_grab()
# PRIVATE METHODS # PRIVATE METHODS
def _is_mouse_out(self, window, event): # Is the mouse out of the widget ?
# If we're clicking outside of the Palette def _is_mouse_out(self, widget):
# return True mouse_x, mouse_y = widget.get_pointer()
event_rect = gdk.Rectangle(int(event.x), int(event.y), 1, 1) event_rect = gdk.Rectangle(mouse_x, mouse_y, 1, 1)
if (event.window != self.window or self.allocation.intersect(event_rect).width==0): if (self.allocation.intersect(event_rect).width==0):
return True return True
else: else:
return False return False
@ -249,8 +262,9 @@ class Palette(gtk.Window):
# Mouse is out of the widget # Mouse is out of the widget
def _mouse_out_widget_cb(self, widget, event): def _mouse_out_widget_cb(self, widget, event):
if (widget == self) and self._is_mouse_out(widget, event): time.sleep(self._POPUP_PALETTE_DELAY)
self._pointer_grab() if (widget == self) and self._is_mouse_out(widget):
self._close_palette_cb()
# Mouse inside the widget # Mouse inside the widget
def _mouse_over_widget_cb(self, widget, event): def _mouse_over_widget_cb(self, widget, event):