From 854293b904f4bc59f768ec264103d5f7992a6a83 Mon Sep 17 00:00:00 2001
From: Niklas Liesch <niklas.liesch@protonmail.com>
Date: Thu, 24 Apr 2025 14:51:39 +0200
Subject: [PATCH 1/2] adding snap to grid button 	new file:  
 crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg 
 modified:   crates/rnote-ui/data/meson.build 	modified:  
 crates/rnote-ui/data/resources.gresource.xml 	modified:  
 crates/rnote-ui/data/ui/mainheader.ui 	modified:  
 crates/rnote-ui/data/ui/penssidebar/selectorpage.ui

---
 .../scalable/actions/snap-to-grid-symbolic.svg      | 10 ++++++++++
 crates/rnote-ui/data/meson.build                    |  1 +
 crates/rnote-ui/data/resources.gresource.xml        |  1 +
 crates/rnote-ui/data/ui/mainheader.ui               |  2 +-
 crates/rnote-ui/data/ui/penssidebar/selectorpage.ui | 13 ++++++++++++-
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg

diff --git a/crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg b/crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg
new file mode 100644
index 0000000000..b012b35ccc
--- /dev/null
+++ b/crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg
@@ -0,0 +1,10 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24.00 24.00" xmlns="http://www.w3.org/2000/svg" fill="#241f31" stroke="#241f31" stroke-width="0.00024000000000000003">
+
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+
<g id="SVGRepo_iconCarrier">
+
<path d="M10 4H6V1H5v3H1v1h4v4H1v1h4v4H1v1h4v4H1v1h4v3h1v-3h4v3h1V1h-1zM6 5h4v4H6zm0 5h4v4H6zm0 9v-4h4v4zM17.8 6H12v4h5.8a2 2 0 0 1 0 4H12v4h5.8a6 6 0 0 0 0-12zM13 7h2v2h-2zm0 8h2v2h-2zm4.8 2H16v-2h1.8a3 3 0 0 0 0-6H16V7h1.8a5 5 0 0 1 0 10z"/>
+
<path fill="none" d="M0 0h24v24H0z"/>
+
</g>
+
</svg>
\ No newline at end of file
diff --git a/crates/rnote-ui/data/meson.build b/crates/rnote-ui/data/meson.build
index abc1032e1c..1cdba8f3b0 100644
--- a/crates/rnote-ui/data/meson.build
+++ b/crates/rnote-ui/data/meson.build
@@ -262,6 +262,7 @@ rnote_ui_gresources_icons_files = files(
     'icons/scalable/actions/shapebuilder-quadrantcoordsystem2d-symbolic.svg',
     'icons/scalable/actions/shapebuilder-rectangle-symbolic.svg',
     'icons/scalable/actions/sidebar-reveal-symbolic.svg',
+    'icons/scalable/actions/snap-to-grid-symbolic.svg',
     'icons/scalable/actions/stroke-color-symbolic.svg',
     'icons/scalable/actions/stylus-button-eraser-symbolic.svg',
     'icons/scalable/actions/stylus-button-primary-symbolic.svg',
diff --git a/crates/rnote-ui/data/resources.gresource.xml b/crates/rnote-ui/data/resources.gresource.xml
index 356b29244b..8993ddebf9 100644
--- a/crates/rnote-ui/data/resources.gresource.xml
+++ b/crates/rnote-ui/data/resources.gresource.xml
@@ -134,6 +134,7 @@
         <file compressed="true">icons/scalable/actions/shapebuilder-quadrantcoordsystem2d-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/shapebuilder-rectangle-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/sidebar-reveal-symbolic.svg</file>
+        <file compressed="true">icons/scalable/actions/snap-to-grid-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/stroke-color-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/stylus-button-eraser-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/stylus-button-primary-symbolic.svg</file>
diff --git a/crates/rnote-ui/data/ui/mainheader.ui b/crates/rnote-ui/data/ui/mainheader.ui
index 037231106d..1b1eddfa05 100644
--- a/crates/rnote-ui/data/ui/mainheader.ui
+++ b/crates/rnote-ui/data/ui/mainheader.ui
@@ -101,4 +101,4 @@
       </object>
     </child>
   </template>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/crates/rnote-ui/data/ui/penssidebar/selectorpage.ui b/crates/rnote-ui/data/ui/penssidebar/selectorpage.ui
index 705810264d..b37d64515b 100644
--- a/crates/rnote-ui/data/ui/penssidebar/selectorpage.ui
+++ b/crates/rnote-ui/data/ui/penssidebar/selectorpage.ui
@@ -78,6 +78,17 @@
             </style>
           </object>
         </child>
+        <child>
+          <object class="GtkToggleButton" id="snap_to_grid_toggle_button">
+            <property name="tooltip_text" translatable="yes">Snap to Grid When Moving the Selection</property>
+            <property name="action-name">win.snap-positions</property>
+            <property name="icon_name">snap-to-grid-symbolic</property>
+            <style>
+              <class name="flat" />
+              <class name="sidebar_action_button" />
+            </style>
+          </object>
+        </child>
         <child>
           <object class="GtkButton" id="selection_select_all_button">
             <property name="tooltip_text" translatable="yes">Select All Strokes</property>
@@ -137,4 +148,4 @@
       </object>
     </child>
   </template>
-</interface>
\ No newline at end of file
+</interface>

From b832558efa8906ec30b7c34c192182c1e7d5ea40 Mon Sep 17 00:00:00 2001
From: Niklas Liesch <niklas.liesch@protonmail.com>
Date: Sat, 17 May 2025 14:50:04 +0200
Subject: [PATCH 2/2] fixing issues with windows 	modified:  
 crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg

---
 .../actions/snap-to-grid-symbolic.svg         | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg b/crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg
index b012b35ccc..2956cf611e 100644
--- a/crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg
+++ b/crates/rnote-ui/data/icons/scalable/actions/snap-to-grid-symbolic.svg
@@ -1,10 +1,20 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 24.00 24.00" xmlns="http://www.w3.org/2000/svg" fill="#241f31" stroke="#241f31" stroke-width="0.00024000000000000003">
-
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
-
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
-
<g id="SVGRepo_iconCarrier">
-
<path d="M10 4H6V1H5v3H1v1h4v4H1v1h4v4H1v1h4v4H1v1h4v3h1v-3h4v3h1V1h-1zM6 5h4v4H6zm0 5h4v4H6zm0 9v-4h4v4zM17.8 6H12v4h5.8a2 2 0 0 1 0 4H12v4h5.8a6 6 0 0 0 0-12zM13 7h2v2h-2zm0 8h2v2h-2zm4.8 2H16v-2h1.8a3 3 0 0 0 0-6H16V7h1.8a5 5 0 0 1 0 10z"/>
-
<path fill="none" d="M0 0h24v24H0z"/>
-
</g>
-
</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    width="16"
+    height="16"
+    fill="#bebebe"
+    version="1.1"
+    xml:space="preserve"
+    id="svg1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:svg="http://www.w3.org/2000/svg"><defs 
+        id="defs1" />
+    <g
+        id="SVGRepo_iconCarrier"
+        transform="matrix(0.61311498,0,0,0.61311498,0.39737425,0.64262024)">
+        <path
+            d="M 10,4 H 6 V 1 H 5 V 4 H 1 V 5 H 5 V 9 H 1 v 1 h 4 v 4 H 1 v 1 h 4 v 4 H 1 v 1 h 4 v 3 h 1 v -3 h 4 v 3 h 1 V 1 H 10 Z M 6,5 h 4 V 9 H 6 Z m 0,5 h 4 v 4 H 6 Z m 0,9 v -4 h 4 v 4 z M 17.8,6 H 12 v 4 h 5.8 a 2,2 0 0 1 0,4 H 12 v 4 h 5.8 a 6,6 0 0 0 0,-12 z M 13,7 h 2 v 2 h -2 z m 0,8 h 2 v 2 h -2 z m 4.8,2 H 16 v -2 h 1.8 a 3,3 0 0 0 0,-6 H 16 V 7 h 1.8 a 5,5 0 0 1 0,10 z"
+            style="color:#000000;fill:#353535;fill-opacity:1;stroke-width:0.0024"
+            id="path1" />
+        </g>
+</svg>