From 1311944667c4ceb8338278b8817e3a5928a6c465 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Wed, 15 Nov 2023 20:30:58 -0300
Subject: [PATCH] Add option to enable the Snap to Grid option for the brush
 preview (fix #4137)

---
 data/pref.xml                       | 1 +
 data/strings/en.ini                 | 1 +
 data/widgets/options.xml            | 3 +++
 src/app/ui/editor/brush_preview.cpp | 3 ++-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/pref.xml b/data/pref.xml
index 52b684bdf..07e1bd493 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -212,6 +212,7 @@
       <option id="cursor_color" type="app::Color" default="app::Color::fromMask()" />
       <option id="painting_cursor_type" type="PaintingCursorType" default="PaintingCursorType::CROSSHAIR_ON_SPRITE" />
       <option id="brush_preview" type="BrushPreview" default="BrushPreview::FULL" />
+      <option id="snap_to_grid" type="bool" default="false" />
     </section>
     <section id="preview" text="Preview">
       <option id="play_once" type="bool" default="false" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index 38616c8e7..6dab0ff71 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -1701,6 +1701,7 @@ brush_preview_fullnedges = Full Preview and Edges
 cursor_color_type = Crosshair && Brush Edges Color:
 cursor_neg_bw = Negative Black and White
 cursor_specific_color = Specific Color
+snap_cursor_to_grid = Snap To Grid when the option is enabled
 bg_checkered = Checkered Background
 bg_size = Size:
 bg_custom_size = Custom
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index cdb7b95b3..e27b11966 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -346,6 +346,9 @@
 
 	    <boxfiller />
 	    <colorpicker id="cursor_color" rgba="true" />
+
+            <check text="@.snap_cursor_to_grid"
+                   pref="cursor.snap_to_grid" cell_hspan="2" />
 	  </grid>
         </vbox>
 
diff --git a/src/app/ui/editor/brush_preview.cpp b/src/app/ui/editor/brush_preview.cpp
index a1dd7dc51..9f2c143be 100644
--- a/src/app/ui/editor/brush_preview.cpp
+++ b/src/app/ui/editor/brush_preview.cpp
@@ -176,7 +176,8 @@ void BrushPreview::show(const gfx::Point& screenPos)
 
   // Get cursor position in the editor
   gfx::Point spritePos = m_editor->screenToEditor(screenPos);
-  if (m_editor->docPref().grid.snap()) {
+  if (pref.cursor.snapToGrid() &&
+      m_editor->docPref().grid.snap()) {
     spritePos = snap_to_grid(m_editor->docPref().grid.bounds(),
                              spritePos,
                              PreferSnapTo::ClosestGridVertex) +