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

Cleanup a bit the positioning logic. Drop specific

Browse Source 
positioning, we can readd it later if it proves to
be necessary.
This commit is contained in:
Marco Pesenti Gritti 2007-08-29 18:26:58 +02:00
parent 722b9d01e7
commit 72b3a3e2e2
1 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
sugar/graphics/palette.py
View File

@ -73,10 +73,6 @@ class Palette(gtk.Window):
DEFAULT = 0 DEFAULT = 0
AT_CURSOR = 1 AT_CURSOR = 1
AROUND = 2 AROUND = 2
BOTTOM = 3
LEFT = 4
RIGHT = 5
TOP = 6
PRIMARY = 0 PRIMARY = 0
SECONDARY = 1 SECONDARY = 1
@ -302,38 +298,21 @@ class Palette(gtk.Window):
return int(x), int(y) return int(x), int(y)
def _get_left_position(self, inv_rect=None): def _get_around_alignments(self):
x, y = self._get_position(-1.0, 0.0, 0.0, 0.0, inv_rect) return ((0.0, 0.0, 0.0, 1.0),
if not self._in_screen(x, y): (-1.0, 0.0, 1.0, 1.0),
x, y = self._get_position(-1.0, -1.0, 0.0, 1.0, inv_rect) (0.0, 0.0, 1.0, 0.0),
return x, y (0.0, -1.0, 1.0, 1.0),
(0.0, -1.0, 0.0, 0.0),
(-1.0, -1.0, 1.0, 0.0),
(-1.0, 0.0, 0.0, 0.0),
(-1.0, -1.0, 0.0, 1.0))
def _get_right_position(self, inv_rect=None): def _get_around_position(self):
x, y = self._get_position(0.0, 0.0, 1.0, 0.0, inv_rect) for align in self._get_around_alignments():
if not self._in_screen(x, y): x, y = self._get_position(*align)
x, y = self._get_position(0.0, -1.0, 1.0, 1.0, inv_rect) if self._in_screen(x, y):
return x, y return x, y
def _get_top_position(self, inv_rect=None):
x, y = self._get_position(0.0, -1.0, 0.0, 0.0, inv_rect)
if not self._in_screen(x, y):
x, y = self._get_position(-1.0, -1.0, 1.0, 0.0, inv_rect)
return x, y
def _get_bottom_position(self, inv_rect=None):
x, y = self._get_position(0.0, 0.0, 0.0, 1.0, inv_rect)
if not self._in_screen(x, y):
x, y = self._get_position(-1.0, 0.0, 1.0, 1.0, inv_rect)
return x, y
def _get_around_position(self, inv_rect=None):
x, y = self._get_bottom_position(inv_rect)
if not self._in_screen(x, y):
x, y = self._get_right_position(inv_rect)
if not self._in_screen(x, y):
x, y = self._get_top_position(inv_rect)
if not self._in_screen(x, y):
x, y = self._get_left_position(inv_rect)
return x, y return x, y
@ -383,14 +362,6 @@ class Palette(gtk.Window):
x, y = self._get_at_cursor_position(rect) x, y = self._get_at_cursor_position(rect)
elif position == self.AROUND: elif position == self.AROUND:
x, y = self._get_around_position() x, y = self._get_around_position()
elif position == self.BOTTOM:
x, y = self._get_bottom_position()
elif position == self.LEFT:
x, y = self._get_left_position()
elif position == self.RIGHT:
x, y = self._get_right_position()
elif position == self.TOP:
x, y = self._get_top_position()
self.move(x, y) self.move(x, y)