AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-20 05:50:11 +00:00
Code Issues Projects Releases Wiki Activity

droptarget: Make formats construct-only writable

Browse Source 
This way, it can be set in GtkBuilder.

Also make sure to only ever look at the GTypes set in the formats, as
GtkDropTarget cannot deal with mime types.
This commit is contained in:
Benjamin Otte 2021-07-26 02:34:18 +02:00
parent 0781429dc5
commit 192bfa10cb
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkdroptarget.c
View File

@ -344,7 +344,7 @@ gtk_drop_target_accept (GtkDropTarget *self,
if (self->formats == NULL) if (self->formats == NULL)
return TRUE; return TRUE;
return gdk_content_formats_match (self->formats, gdk_drop_get_formats (drop)); return gdk_content_formats_match_gtype (self->formats, gdk_drop_get_formats (drop)) != G_TYPE_INVALID;
} }
static GdkDragAction static GdkDragAction
@ -544,6 +544,12 @@ gtk_drop_target_set_property (GObject *object,
gtk_drop_target_set_actions (self, g_value_get_flags (value)); gtk_drop_target_set_actions (self, g_value_get_flags (value));
break; break;
case PROP_FORMATS:
self->formats = g_value_dup_boxed (value);
if (self->formats == NULL)
self->formats = gdk_content_formats_new (NULL, 0);
break;
case PROP_PRELOAD: case PROP_PRELOAD:
gtk_drop_target_set_preload (self, g_value_get_boolean (value)); gtk_drop_target_set_preload (self, g_value_get_boolean (value));
break; break;
@ -661,7 +667,7 @@ gtk_drop_target_class_init (GtkDropTargetClass *class)
P_("Formats"), P_("Formats"),
P_("The supported formats"), P_("The supported formats"),
GDK_TYPE_CONTENT_FORMATS, GDK_TYPE_CONTENT_FORMATS,
GTK_PARAM_READABLE); GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
/** /**
* GtkDropTarget:preload: (attributes org.gtk.Property.get=gtk_drop_target_get_preload org.gtk.Property.set=gtk_drop_target_set_preload) * GtkDropTarget:preload: (attributes org.gtk.Property.get=gtk_drop_target_get_preload org.gtk.Property.set=gtk_drop_target_set_preload)
@ -843,7 +849,6 @@ gtk_drop_target_class_init (GtkDropTargetClass *class)
static void static void
gtk_drop_target_init (GtkDropTarget *self) gtk_drop_target_init (GtkDropTarget *self)
{ {
self->formats = gdk_content_formats_new (NULL, 0);
} }
/** /**
@ -864,13 +869,19 @@ gtk_drop_target_new (GType type,
GdkDragAction actions) GdkDragAction actions)
{ {
GtkDropTarget *result; GtkDropTarget *result;
GdkContentFormats *formats;
if (type != G_TYPE_INVALID)
formats = gdk_content_formats_new_for_gtype (type);
else
formats = NULL;
result = g_object_new (GTK_TYPE_DROP_TARGET, result = g_object_new (GTK_TYPE_DROP_TARGET,
"formats", formats,
"actions", actions, "actions", actions,
NULL); NULL);
if (type != G_TYPE_INVALID) g_clear_pointer (&formats, gdk_content_formats_unref);
gtk_drop_target_set_gtypes (result, &type, 1);
return result; return result;
} }