Mercurial > nagslang
comparison tools/area_editor.py @ 430:c0264b247326
Merge.
author | David Sharpe <decoydavid@gmail.com> |
---|---|
date | Sat, 07 Sep 2013 13:47:10 +0200 |
parents | 275e0b4bd571 |
children | ed5ba04d553c |
comparison
equal
deleted
inserted
replaced
429:46ecb2c4cb61 | 430:c0264b247326 |
---|---|
424 new_pos[1] = self.pos[1] | 424 new_pos[1] = self.pos[1] |
425 self.pos = tuple(new_pos) | 425 self.pos = tuple(new_pos) |
426 | 426 |
427 def inc_grid_size(self, amount): | 427 def inc_grid_size(self, amount): |
428 self.grid_size = max(1, self.grid_size + amount) | 428 self.grid_size = max(1, self.grid_size + amount) |
429 if self.grid_size > 1: | |
430 self.grid_size = self.grid_size - (self.grid_size % 5) | |
429 | 431 |
430 def snap_to_grid(self, pos): | 432 def snap_to_grid(self, pos): |
431 x = pos[0] - (pos[0] % self.grid_size) | 433 x = pos[0] - (pos[0] % self.grid_size) |
432 y = pos[1] - (pos[1] % self.grid_size) | 434 y = pos[1] - (pos[1] % self.grid_size) |
433 return (x, y) | 435 return (x, y) |
880 self.level_widget, width=BUTTON_RECT.width, | 882 self.level_widget, width=BUTTON_RECT.width, |
881 align="c", fg_color=white) | 883 align="c", fg_color=white) |
882 grid_size_label.rect.move_ip(MENU_LEFT, y) | 884 grid_size_label.rect.move_ip(MENU_LEFT, y) |
883 widgets.append(grid_size_label) | 885 widgets.append(grid_size_label) |
884 y += grid_size_label.rect.height + MENU_PAD | 886 y += grid_size_label.rect.height + MENU_PAD |
885 inc_snap_but = SnapButton(grid_size_label, self, 1) | 887 inc_snap_but = SnapButton(grid_size_label, self, 5) |
886 inc_snap_but.rect = HALF_BUTTON_RECT.copy() | 888 inc_snap_but.rect = HALF_BUTTON_RECT.copy() |
887 inc_snap_but.rect.move_ip(MENU_LEFT, y) | 889 inc_snap_but.rect.move_ip(MENU_LEFT, y) |
888 widgets.append(inc_snap_but) | 890 widgets.append(inc_snap_but) |
889 dec_snap_but = SnapButton(grid_size_label, self, -1) | 891 dec_snap_but = SnapButton(grid_size_label, self, -5) |
890 dec_snap_but.rect = HALF_BUTTON_RECT.copy() | 892 dec_snap_but.rect = HALF_BUTTON_RECT.copy() |
891 dec_snap_but.rect.move_ip( | 893 dec_snap_but.rect.move_ip( |
892 MENU_LEFT + MENU_HALF_WIDTH, y) | 894 MENU_LEFT + MENU_HALF_WIDTH, y) |
893 widgets.append(dec_snap_but) | 895 widgets.append(dec_snap_but) |
894 y += MENU_BUTTON_HEIGHT + MENU_PAD | 896 y += MENU_BUTTON_HEIGHT + MENU_PAD |