changeset 430:c0264b247326

Merge.
author David Sharpe <decoydavid@gmail.com>
date Sat, 07 Sep 2013 13:47:10 +0200
parents 46ecb2c4cb61 (current diff) 275e0b4bd571 (diff)
children fef028d65451
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tools/area_editor.py	Sat Sep 07 13:39:10 2013 +0200
+++ b/tools/area_editor.py	Sat Sep 07 13:47:10 2013 +0200
@@ -426,6 +426,8 @@
 
     def inc_grid_size(self, amount):
         self.grid_size = max(1, self.grid_size + amount)
+        if self.grid_size > 1:
+            self.grid_size = self.grid_size - (self.grid_size % 5)
 
     def snap_to_grid(self, pos):
         x = pos[0] - (pos[0] % self.grid_size)
@@ -882,11 +884,11 @@
         grid_size_label.rect.move_ip(MENU_LEFT, y)
         widgets.append(grid_size_label)
         y += grid_size_label.rect.height + MENU_PAD
-        inc_snap_but = SnapButton(grid_size_label, self, 1)
+        inc_snap_but = SnapButton(grid_size_label, self, 5)
         inc_snap_but.rect = HALF_BUTTON_RECT.copy()
         inc_snap_but.rect.move_ip(MENU_LEFT, y)
         widgets.append(inc_snap_but)
-        dec_snap_but = SnapButton(grid_size_label, self, -1)
+        dec_snap_but = SnapButton(grid_size_label, self, -5)
         dec_snap_but.rect = HALF_BUTTON_RECT.copy()
         dec_snap_but.rect.move_ip(
             MENU_LEFT + MENU_HALF_WIDTH, y)