callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: fix gimp_container_view_multi_selected().

Browse Source 
The whole hack for types managed by context is not needed anymore. It
works fine with generic code. Also because of this hack, there was a bug
when clicking on some button raising a container popup (such as the
"Dynamics" button in tool options) would reset the context to default
value (e.g. reset to "Basic Dynamics") on the first click, without
raising the popup. Only the second click would raise a popup.
This commit is contained in:
Jehan
2021-11-05 18:05:08 +01:00
parent 9a1a7a766c
commit 28f6b1b268
1 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/widgets/gimpcontainerview.c
View File

@ -677,48 +677,12 @@ gimp_container_view_multi_selected (GimpContainerView *view,
GList *items_data)
{
gboolean success = FALSE;
guint selected_count;
g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), FALSE);
selected_count = g_list_length (items);
/* For some types of transient containers, the fact of setting the
* context makes the container disappear (i.e. the object is
* destroyed). So we add a weak pointer to not send a signal to a dead
* reference later.
*/
g_object_add_weak_pointer (G_OBJECT (view), (gpointer) &view);
if (selected_count == 1)
{
GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
/* HACK for some specific types managed by context. */
if (private->container && private->context)
{
GType children_type;
const gchar *signal_name;
children_type = gimp_container_get_children_type (private->container);
signal_name = gimp_context_type_to_signal_name (children_type);
if (signal_name)
{
gimp_context_set_by_type (private->context, children_type,
GIMP_OBJECT (items->data));
}
}
}
if (view)
{
if (selected_count > 0)
{
g_signal_emit (view, view_signals[SELECT_ITEMS], 0,
items, items_data, &success);
}
g_object_remove_weak_pointer (G_OBJECT (view), (gpointer) &view);
}
if (! gimp_container_view_are_selected_items (view, items))
g_signal_emit (view, view_signals[SELECT_ITEMS], 0,
items, items_data, &success);
return success;
}