From 10610614586dcbf40fdbad4f453fb3810f325b3b Mon Sep 17 00:00:00 2001 From: darechan Date: Thu, 23 Feb 2023 17:37:13 +0530 Subject: [PATCH 1/2] #3421 fixing snap panel group --- src/actions/actions-canvas-snapping.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/actions/actions-canvas-snapping.cpp b/src/actions/actions-canvas-snapping.cpp index 94a9e103d5..a57fac5acf 100644 --- a/src/actions/actions-canvas-snapping.cpp +++ b/src/actions/actions-canvas-snapping.cpp @@ -350,7 +350,7 @@ void set_actions_canvas_snapping(Gio::ActionMap& map) { { "snap-alignment", alignment, global }, { "snap-alignment-self", snapprefs.isSnapButtonEnabled(SNAPTARGET_ALIGNMENT_HANDLE), global && alignment }, - { "snap-distribution", distribution, global }, + { "snap-distribution", distribution, global && alignment }, { "snap-bbox", bbox, global }, { "snap-bbox-edge", snapprefs.isSnapButtonEnabled(SNAPTARGET_BBOX_EDGE), global && bbox }, @@ -371,15 +371,14 @@ void set_actions_canvas_snapping(Gio::ActionMap& map) { { "snap-object-midpoint", snapprefs.isSnapButtonEnabled(SNAPTARGET_OBJECT_MIDPOINT), global && other }, { "snap-rotation-center", snapprefs.isSnapButtonEnabled(SNAPTARGET_ROTATION_CENTER), global && other }, { "snap-text-baseline", snapprefs.isSnapButtonEnabled(SNAPTARGET_TEXT_BASELINE), global && other }, + { "snap-path-clip", snapprefs.isSnapButtonEnabled(SNAPTARGET_PATH_CLIP), global && other }, + { "snap-path-mask", snapprefs.isSnapButtonEnabled(SNAPTARGET_PATH_MASK), global && other }, { "snap-page-border", snapprefs.isSnapButtonEnabled(SNAPTARGET_PAGE_EDGE_BORDER), global }, { "snap-page-margin", snapprefs.isSnapButtonEnabled(SNAPTARGET_PAGE_MARGIN_BORDER), global }, { "snap-grid", snapprefs.isSnapButtonEnabled(SNAPTARGET_GRID), global }, { "snap-guide", snapprefs.isSnapButtonEnabled(SNAPTARGET_GUIDE), global }, - { "snap-path-clip", snapprefs.isSnapButtonEnabled(SNAPTARGET_PATH_CLIP), global }, - { "snap-path-mask", snapprefs.isSnapButtonEnabled(SNAPTARGET_PATH_MASK), global }, - { "simple-snap-bbox", bbox, global }, { "simple-snap-nodes", node, global }, { "simple-snap-alignment", alignment, global }, -- GitLab From dc9d2a58a55e7b644b8fcc4e06015fc9a6647ce7 Mon Sep 17 00:00:00 2001 From: darechan Date: Sat, 25 Feb 2023 14:52:25 +0530 Subject: [PATCH 2/2] Fixing Snap Panel Group #3421 --- src/actions/actions-canvas-snapping.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/actions/actions-canvas-snapping.cpp b/src/actions/actions-canvas-snapping.cpp index a57fac5acf..52033211ba 100644 --- a/src/actions/actions-canvas-snapping.cpp +++ b/src/actions/actions-canvas-snapping.cpp @@ -339,7 +339,6 @@ void set_actions_canvas_snapping(Gio::ActionMap& map) { auto& snapprefs = get_snapping_preferences(); bool global = snapprefs.getSnapEnabledGlobally(); bool alignment = snapprefs.isTargetSnappable(SNAPTARGET_ALIGNMENT_CATEGORY); - bool distribution = snapprefs.isTargetSnappable(SNAPTARGET_DISTRIBUTION_CATEGORY); bool bbox = snapprefs.isTargetSnappable(SNAPTARGET_BBOX_CATEGORY); bool node = snapprefs.isTargetSnappable(SNAPTARGET_NODE_CATEGORY); bool other = snapprefs.isTargetSnappable(SNAPTARGET_OTHERS_CATEGORY); @@ -349,8 +348,7 @@ void set_actions_canvas_snapping(Gio::ActionMap& map) { { "snap-alignment", alignment, global }, { "snap-alignment-self", snapprefs.isSnapButtonEnabled(SNAPTARGET_ALIGNMENT_HANDLE), global && alignment }, - - { "snap-distribution", distribution, global && alignment }, + { "snap-distribution", snapprefs.isSnapButtonEnabled(SNAPTARGET_DISTRIBUTION_CATEGORY), global && alignment }, { "snap-bbox", bbox, global }, { "snap-bbox-edge", snapprefs.isSnapButtonEnabled(SNAPTARGET_BBOX_EDGE), global && bbox }, @@ -371,6 +369,7 @@ void set_actions_canvas_snapping(Gio::ActionMap& map) { { "snap-object-midpoint", snapprefs.isSnapButtonEnabled(SNAPTARGET_OBJECT_MIDPOINT), global && other }, { "snap-rotation-center", snapprefs.isSnapButtonEnabled(SNAPTARGET_ROTATION_CENTER), global && other }, { "snap-text-baseline", snapprefs.isSnapButtonEnabled(SNAPTARGET_TEXT_BASELINE), global && other }, + { "snap-path-clip", snapprefs.isSnapButtonEnabled(SNAPTARGET_PATH_CLIP), global && other }, { "snap-path-mask", snapprefs.isSnapButtonEnabled(SNAPTARGET_PATH_MASK), global && other }, -- GitLab