Mercurial > pyntnclick
comparison pyntnclick/tools/rect_drawer.py @ 737:69a0349dce8e pyntnclick
Fix rect_drawer to call prepare
author | Neil Muller <neil@mcp.home.test> |
---|---|
date | Wed, 16 Jan 2013 00:28:12 +0200 |
parents | 3aa6163f0775 |
children | 960af9761fb0 |
comparison
equal
deleted
inserted
replaced
736:f5e381e819a1 | 737:69a0349dce8e |
---|---|
52 self._palette.cur_selection.selected = False | 52 self._palette.cur_selection.selected = False |
53 self.selected = True | 53 self.selected = True |
54 self._palette.cur_selection = self | 54 self._palette.cur_selection = self |
55 | 55 |
56 def draw(self, surface): | 56 def draw(self, surface): |
57 self.do_prepare() | |
57 surface.fill(pygame.color.Color(0, 0, 0), self.rect) | 58 surface.fill(pygame.color.Color(0, 0, 0), self.rect) |
58 if self.selected: | 59 if self.selected: |
59 surface.fill(self.sel_colour, self._button_rect) | 60 surface.fill(self.sel_colour, self._button_rect) |
60 else: | 61 else: |
61 surface.fill(self.unsel_colour, self._button_rect) | 62 surface.fill(self.unsel_colour, self._button_rect) |
272 | 273 |
273 def invalidate(self): | 274 def invalidate(self): |
274 self.clear_display = True | 275 self.clear_display = True |
275 | 276 |
276 def draw(self, surface): | 277 def draw(self, surface): |
278 self.do_prepare() | |
277 if self.clear_display: | 279 if self.clear_display: |
278 surface.fill(pygame.color.Color(0, 0, 0)) | 280 surface.fill(pygame.color.Color(0, 0, 0)) |
279 self.clear_display = False | 281 self.clear_display = False |
280 | 282 |
281 if self.zoom_display: | 283 if self.zoom_display: |
519 | 521 |
520 def mouse_up(self, ev, widget): | 522 def mouse_up(self, ev, widget): |
521 if self._parent.paused: | 523 if self._parent.paused: |
522 return False | 524 return False |
523 if self.mode == 'draw': | 525 if self.mode == 'draw': |
526 if self.start_pos is None: | |
527 # We've come here not via a drawing situation, so bail | |
528 return False | |
524 rect = pygame.rect.Rect(self.start_pos[0], self.start_pos[1], | 529 rect = pygame.rect.Rect(self.start_pos[0], self.start_pos[1], |
525 self.end_pos[0] - self.start_pos[0], | 530 self.end_pos[0] - self.start_pos[0], |
526 self.end_pos[1] - self.start_pos[1]) | 531 self.end_pos[1] - self.start_pos[1]) |
527 rect.normalize() | 532 rect.normalize() |
528 self.rects.append((self.rect_color, rect)) | 533 self.rects.append((self.rect_color, rect)) |
561 super(ModeLabel, self).__init__(rect, | 566 super(ModeLabel, self).__init__(rect, |
562 gd, 'Mode : ', fontname=constants.bold_font, | 567 gd, 'Mode : ', fontname=constants.bold_font, |
563 fontsize=15, color=pygame.color.Color(128, 0, 255)) | 568 fontsize=15, color=pygame.color.Color(128, 0, 255)) |
564 | 569 |
565 def draw(self, surface): | 570 def draw(self, surface): |
571 self.do_prepare() | |
566 text = 'Mode : %s' % self.app_image.mode | 572 text = 'Mode : %s' % self.app_image.mode |
567 if self.text != text: | 573 if self.text != text: |
568 self.text = text | 574 self.text = text |
569 self.prepare() | 575 self.prepare() |
570 super(ModeLabel, self).draw(surface) | 576 super(ModeLabel, self).draw(surface) |