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

Palette positioning fixes #298

Browse Source 
Don't try to align the palette to the edges if the invoker is AT_CURSOR,
and always try to move the palette completely into the screen if at all
possible.
This commit is contained in:
Tomeu Vizoso 2009-02-03 15:03:36 +01:00
parent d0d4f55121
commit e8c36247a5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sugar/graphics/palette.py
View File

@ -836,7 +836,17 @@ class Invoker(gobject.GObject):
def get_position(self, palette_dim): def get_position(self, palette_dim):
alignment = self.get_alignment(palette_dim) alignment = self.get_alignment(palette_dim)
return self._get_position_for_alignment(alignment, palette_dim) rect = self._get_position_for_alignment(alignment, palette_dim)
# In case our efforts to find an optimum place inside the screen failed,
# just make sure the palette fits inside the screen if at all possible.
rect.x = max(0, rect.x)
rect.y = max(0, rect.y)
rect.x = min(rect.x, self._screen_area.width - rect.width)
rect.y = min(rect.y, self._screen_area.height - rect.height)
return rect
def get_alignment(self, palette_dim): def get_alignment(self, palette_dim):
best_alignment = None best_alignment = None
@ -877,7 +887,7 @@ class Invoker(gobject.GObject):
pv = -float(palette_dim[1] - dbottom - rect.height) \ pv = -float(palette_dim[1] - dbottom - rect.height) \
/ palette_dim[1] / palette_dim[1]
else: elif best_alignment in self.TOP or best_alignment in self.BOTTOM:
dleft = rect.x - screen_area.x dleft = rect.x - screen_area.x
dright = screen_area.x + screen_area.width - rect.x - rect.width dright = screen_area.x + screen_area.width - rect.x - rect.width