From 230ddd6218a095066428a5339f76468e0fe4c3a7 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Mon, 25 Feb 2013 01:07:37 +0000 Subject: more tweaking of toolbar dynamic reorg --- diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index fea193a..56716b4 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -123,7 +123,8 @@ class TurtleArtActivity(activity.Activity): # If there are too many palettes to fit, put them in a # scrolling window - if gtk.gdk.screen_width() / (len(self.palette_buttons) + 2) < 55: + if gtk.gdk.screen_width() / (len(self.palette_buttons) + 2) \ + < style.GRID_CELL_SIZE: if self.palette_toolbar_button.is_expanded(): self.palette_toolbar_button.set_expanded(False) self.palette_toolbar_button.hide() @@ -132,15 +133,7 @@ class TurtleArtActivity(activity.Activity): self.palette_toolbar_button.show() self.palette_palette_button.hide() - # Refresh the buttons to the right of our intervention - self.eraser_button.show() - self.run_button.show() - self.step_button.show() - self.stop_turtle_button.show() - self._help_button.show() - - if gtk.gdk.screen_width() > gtk.gdk.screen_height() and \ - gtk.gdk.screen_width() > 799: + if gtk.gdk.screen_width() / 14 > style.GRID_CELL_SIZE: self.extras_separator.props.draw = True self.extras_separator.show() self.keep_button.show() @@ -161,6 +154,13 @@ class TurtleArtActivity(activity.Activity): self.samples_button2.show() self.samples_label2.show() + # Refresh the buttons to the right of our intervention + self.eraser_button.show() + self.run_button.show() + self.step_button.show() + self.stop_turtle_button.show() + self._help_button.show() + self._toolbox.show() # Activity toolbar callbacks -- cgit v0.9.1