Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter@sugarlabs.org>2014-04-05 13:32:25 (GMT)
committer Walter Bender <walter@sugarlabs.org>2014-04-05 13:32:25 (GMT)
commitdee22790102d523fda011b03db73620f7cbf4d64 (patch)
tree3292534ad32153096c923a01ad24327b1200384d
parent5024b718007b01067b2f1570662281d265dc5b38 (diff)
fix problem with label offset (SL #4754)
-rw-r--r--TurtleArt/tawindow.py6
-rw-r--r--TurtleArtActivity.py1
2 files changed, 4 insertions, 3 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 902b185..71eb104 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -4310,13 +4310,13 @@ class TurtleArtWindow():
self.status_spr.move((PALETTE_WIDTH, self.height - 400))
else:
# Adjust vertical position based on scrolled window adjustment
- offset_from_bottom = 60
if self.running_sugar:
+ offset_from_bottom = self.activity.label_offset
if self.activity.toolbox.get_property("visible"):
if self.activity.toolbars_expanded():
- offset_from_bottom += 110
+ offset_from_bottom *= 3
else:
- offset_from_bottom += 60
+ offset_from_bottom *= 2
self.status_spr.move(
(0,
self.height - offset_from_bottom +
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index cce2d2d..adc34a4 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -111,6 +111,7 @@ class TurtleArtActivity(activity.Activity):
self.has_toolbarbox = HAS_TOOLBARBOX
_logger.debug('_setup_toolbar')
self._setup_toolbar()
+ self.label_offset = style.GRID_CELL_SIZE
_logger.debug('_setup_canvas')
self._setup_canvas(self._setup_scrolled_window())