procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app:vectors: fix #12120 CRITICAL on shift-start action on a bezier Handle

Browse source 
This eliminates the CRITICAL, which was harmless anyway.

As discussed in the issue, there are more issues:

1. The "shift-start" action is not documented in the user manual.

2. The "shift-start" action quietly does nothing in the case
it has nothing to do.  Better GUI would be to disable the menu item in that case.

3.  The "shift-start" action is non-intuitive, even bizarre.
It could probably be eliminated.
I myself don't understand the use case, and confused it for Path>Reverse.

An alternative fix is to disable the menu item when a handle is the operand.
This fix is better because it gives the user more places to RMB a context menu,
and the context menu mutates less.

Probably needs backport to 2.10.
This commit is contained in:
lloyd konneker 2024-10-08 12:23:41 -04:00 • committed by Lloyd Konneker
parent 8c080b220f
commit 46c9949b7e
1 changed files with 71 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

73
app/vectors/gimpbezierstroke.c
View file

@ -238,6 +238,58 @@ gimp_bezier_stroke_new_from_coords (const GimpCoords *coords,
return stroke;
}
/* Returns the EndPoint (ANCHOR) that a given Handle (CONTROL) controls.
*
* GimpAnchors are in a list.
* GimpAnchors of type ANCHOR are surrounded by two GimpAnchors
* of type CONTROL (Handle) in the pattern HEH HEH....
* E denotes a GimpAnchor of type ANCHOR, aka EndPoint.
* H denotes a GimpAnchor of type CONTROL, aka Handle.
*/
static GimpAnchor*
gimp_bezier_stroke_find_endpoint_for_handle (GimpStroke *stroke,
GimpAnchor *anchor)
{
GList *anchor_element;
GList *prior_anchor_element;
GList *result_element;
/* Require given anchor is CONTROL i.e. Handle. */
g_return_val_if_fail (anchor->type == GIMP_ANCHOR_CONTROL, NULL);
anchor_element = g_queue_find (stroke->anchors, anchor);
prior_anchor_element = g_list_previous (anchor_element);
if (prior_anchor_element == NULL)
{
/* No prior element. Given handle is very first GimpAnchor in the list: thisH E...
* The desired ANCHOR endpoint trails it.
*/
result_element = g_list_next (anchor_element);
}
else if (((GimpAnchor *)prior_anchor_element->data)->type == GIMP_ANCHOR_ANCHOR)
{
/* Prior element is-a ANCHOR i.e. EndPoint.
* Given handle is the trailing handle for the desired endpoint: ...E thisH ...
*/
result_element = prior_anchor_element;
}
else
{
/* Prior element is another CONTROL i.e. handle.
* Given handle is leading the desired endpoint ...H thisH E...
*/
result_element = g_list_next (anchor_element);
}
/* Ensure the list of anchors is not corrupt by missing next anchors. */
g_return_val_if_fail (result_element != NULL, NULL);
/* Ensure result_element type is ANCHOR i.e. EndPoint. */
g_return_val_if_fail (((GimpAnchor*)result_element->data)->type == GIMP_ANCHOR_ANCHOR, NULL);
return result_element->data;
}
static void
gimp_bezier_stroke_anchor_delete (GimpStroke *stroke,
GimpAnchor *anchor)
@ -1358,12 +1410,29 @@ gimp_bezier_stroke_shift_start (GimpStroke *stroke,
GimpAnchor *new_start)
{
GList *link;
GimpAnchor *real_new_start = NULL;
g_return_val_if_fail (GIMP_IS_BEZIER_STROKE (stroke), FALSE);
g_return_val_if_fail (new_start != NULL, FALSE);
g_return_val_if_fail (new_start->type == GIMP_ANCHOR_ANCHOR, FALSE);
link = g_queue_find (stroke->anchors, new_start);
/* Action "shift-start" is enabled for either Handle (CONTROL) or EndPoint (ANCHOR)
* but operates only on an EndPoint.
* When user chose a Handle, get the Handle's EndPoint to operate on.
*/
if (new_start->type == GIMP_ANCHOR_CONTROL)
{
real_new_start = gimp_bezier_stroke_find_endpoint_for_handle (stroke, new_start);
}
else if (new_start->type == GIMP_ANCHOR_ANCHOR)
{
real_new_start = new_start;
}
/* Else type is corrupt and real_new_start is NULL. */
g_return_val_if_fail (real_new_start != NULL, FALSE);
g_return_val_if_fail (real_new_start->type == GIMP_ANCHOR_ANCHOR, FALSE);
link = g_queue_find (stroke->anchors, real_new_start);
if (!link)
return FALSE;