Mercurial > nagslang
changeset 414:060420389033
more zooming
| author | Neil Muller <drnlmuller@gmail.com> |
|---|---|
| date | Sat, 07 Sep 2013 12:49:27 +0200 |
| parents | c5a3ed165df9 |
| children | 9d2a8dfba670 |
| files | tools/area_editor.py |
| diffstat | 1 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/area_editor.py Sat Sep 07 12:43:31 2013 +0200 +++ b/tools/area_editor.py Sat Sep 07 12:49:27 2013 +0200 @@ -598,7 +598,7 @@ self.invalidate() def mouse_down(self, ev): - corrected_pos = ev.pos[0] + self.pos[0], ev.pos[1] + self.pos[1] + corrected_pos = self._level_coordinates(ev.pos) if self.sel_mode and ev.button == 1: obj = self.level.find_obj_at_pos(corrected_pos) if obj is not None: @@ -615,14 +615,13 @@ elif ev.button == 1: if self._draw_lines: if self._start_pos is None: - self._start_pos = ev.pos + self._start_pos = corrected_pos else: - self.level.add_line(self._start_pos, ev.pos) + self.level.add_line(self._start_pos, corrected_pos) self._start_pos = None else: print "Click: %r" % ( - self.level.point_to_pymunk( - self._level_coordinates(ev.pos)),) + self.level.point_to_pymunk(corrected_pos),) if ev.button == 4: # Scroll up self._move_view((0, -10)) elif ev.button == 5: # Scroll down @@ -633,8 +632,7 @@ self._move_view((10, 0)) elif self.cur_poly and ev.button == 1: # Add a point - self.level.add_point(self.cur_poly, - self._level_coordinates(ev.pos)) + self.level.add_point(self.cur_poly, corrected_pos) elif ev.button == 3: self._mouse_drag = True @@ -1020,6 +1018,17 @@ widgets.append(save_but) y += MENU_BUTTON_HEIGHT + MENU_PAD + zoom_out = Button('Zoom out', action=self.level_widget.zoom_out) + zoom_out.rect = BUTTON_RECT.copy() + zoom_out.rect.move_ip(MENU_LEFT, y) + widgets.append(zoom_out) + y += MENU_BUTTON_HEIGHT + MENU_PAD + + zoom_in = Button('Zoom in', action=self.level_widget.zoom_in) + zoom_in.rect = BUTTON_RECT.copy() + zoom_in.rect.move_ip(MENU_LEFT, y) + widgets.append(zoom_in) + y = SCREEN[1] - MENU_BUTTON_HEIGHT - MENU_PAD quit_but = Button('Quit', action=self.quit) quit_but.rect = BUTTON_RECT.copy()