# HG changeset patch
# User David Sharpe <decoydavid@gmail.com>
# Date 1378554430 -7200
# Node ID c0264b24732639c4d07a19a12b29aee8f87819b8
# Parent  46ecb2c4cb61755c0d0a45b0851a8a61d2276ae6# Parent  275e0b4bd571090b2b33d0fce31a4d905905f086
Merge.

diff -r 46ecb2c4cb61 -r c0264b247326 tools/area_editor.py
--- 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)