dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: improve error message when passing out-of-range GimpUnit arguments.

This commit is contained in:
Jehan 2024-08-18 17:38:34 +02:00
parent b5a8f46b37
commit e0b778fe5a
1 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/pdb/gimpprocedure.c
View File

@ -870,7 +870,8 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
}
else if (! (pspec->flags & GIMP_PARAM_NO_VALIDATE))
{
GValue string_value = G_VALUE_INIT;
GObject *old_value = NULL;
GValue string_value = G_VALUE_INIT;
g_value_init (&string_value, G_TYPE_STRING);
@ -880,6 +881,9 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
g_value_set_static_string (&string_value,
"<not transformable to string>");
if (G_IS_PARAM_SPEC_OBJECT (pspec))
old_value = g_value_dup_object (arg);
if (g_param_value_validate (pspec, arg))
{
if (GIMP_IS_PARAM_SPEC_DRAWABLE (pspec) &&
@ -942,6 +946,57 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
g_param_spec_get_name (pspec));
}
}
else if (GIMP_IS_PARAM_SPEC_UNIT (pspec) &&
((GIMP_UNIT (old_value) == gimp_unit_pixel () &&
! GIMP_PARAM_SPEC_UNIT (pspec)->allow_pixel) ||
(GIMP_UNIT (old_value) == gimp_unit_percent () &&
! GIMP_PARAM_SPEC_UNIT (pspec)->allow_percent)))
{
if (return_vals)
{
if (GIMP_UNIT (old_value) == gimp_unit_pixel ())
g_set_error (error,
GIMP_PDB_ERROR,
GIMP_PDB_ERROR_INVALID_RETURN_VALUE,
_("Procedure '%s' returned "
"`gimp_unit_pixel()` as GimpUnit return value #%d '%s'. "
"This return value does not allow pixel unit."),
gimp_object_get_name (procedure),
i + 1, g_param_spec_get_name (pspec));
else
g_set_error (error,
GIMP_PDB_ERROR,
GIMP_PDB_ERROR_INVALID_RETURN_VALUE,
_("Procedure '%s' returned "
"`gimp_unit_percent()` as GimpUnit return value #%d '%s'. "
"This return value does not allow percent unit."),
gimp_object_get_name (procedure),
i + 1, g_param_spec_get_name (pspec));
}
else
{
if (GIMP_UNIT (old_value) == gimp_unit_pixel ())
g_set_error (error,
GIMP_PDB_ERROR,
GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Procedure '%s' has been called with "
"`gimp_unit_pixel()` for GimpUnit "
"argument #%d '%s'. "
"This argument does not allow pixel unit."),
gimp_object_get_name (procedure),
i + 1, g_param_spec_get_name (pspec));
else
g_set_error (error,
GIMP_PDB_ERROR,
GIMP_PDB_ERROR_INVALID_ARGUMENT,
_("Procedure '%s' has been called with "
"`gimp_unit_percent()` for GimpUnit "
"argument #%d '%s'. "
"This argument does not allow percent unit."),
gimp_object_get_name (procedure),
i + 1, g_param_spec_get_name (pspec));
}
}
else
{
const gchar *value = g_value_get_string (&string_value);
@ -980,6 +1035,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
}
g_value_unset (&string_value);
g_clear_object (&old_value);
return FALSE;
}