diff options
author | olpc <olpc@xo-05-26-CC.localdomain> | 2008-12-08 21:13:22 (GMT) |
---|---|---|
committer | olpc <olpc@xo-05-26-CC.localdomain> | 2008-12-08 21:13:22 (GMT) |
commit | 6ac47cd86f55cdf06eede45077173af0502667f6 (patch) | |
tree | a1790c9712a1e57390e132c82625f6fb89e35e40 | |
parent | 19febbb9de90eaf89f426fb7bfcca21ae4b96cf1 (diff) |
Allow stored color retrieval to work at the Brush Controls panel.
-rwxr-xr-x | colors.py | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -339,6 +339,9 @@ class Colors(activity.Activity, ExportedGObject): self.width = gtk.gdk.screen_width() self.height = gtk.gdk.screen_height() + # Set the initial mode to None, it will be set to Intro on the first update. + self.mode = None + # Set up various systems. self.init_input() self.init_zoom() @@ -359,9 +362,6 @@ class Colors(activity.Activity, ExportedGObject): # Start camera processing. #self.init_camera() - # Set the initial mode to None, it will be set to Intro on the first update. - self.mode = None - # Set up mesh networking. self.init_mesh() @@ -1174,6 +1174,10 @@ class Colors(activity.Activity, ExportedGObject): self.easel.play_command(DrawCommand.create_color_change(brush.color), True) self.easel.play_command(DrawCommand.create_size_change(brush.control, brush.type, brush.size/float(self.easel.width), brush.opacity), True) + if self.mode == Colors.MODE_PALETTE: + self.brush_controls.set_brush(self.easel.brush) + self.brush_controls.queue_draw() + self.brushpreviewarea.queue_draw() def pickup_color(self, pos): |