AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'drop-target-name-collision' into 'master'

Browse Source 
droptarget: Rename :drop to :current-drop

Closes #4028

See merge request GNOME/gtk!3669
This commit is contained in:
Matthias Clasen 2021-06-16 00:12:53 +00:00
commit 56c486abbf
4 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gtk/gtkdroptarget.c
View File

@ -148,6 +148,7 @@ struct _GtkDropTargetClass
enum {
PROP_0,
PROP_ACTIONS,
PROP_CURRENT_DROP,
PROP_DROP,
PROP_FORMATS,
PROP_PRELOAD,
@ -186,6 +187,7 @@ gtk_drop_target_end_drop (GtkDropTarget *self)
g_clear_object (&self->drop);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_DROP]);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_CURRENT_DROP]);
if (G_IS_VALUE (&self->value))
{
@ -320,6 +322,7 @@ gtk_drop_target_start_drop (GtkDropTarget *self,
self->drop = g_object_ref (drop);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_DROP]);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_CURRENT_DROP]);
if (self->preload)
gtk_drop_target_load (self);
@ -565,6 +568,7 @@ gtk_drop_target_get_property (GObject *object,
break;
case PROP_DROP:
case PROP_CURRENT_DROP:
g_value_set_object (value, self->drop);
break;
@ -620,15 +624,31 @@ gtk_drop_target_class_init (GtkDropTargetClass *class)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
/**
* GtkDropTarget:drop: (attributes org.gtk.Property.get=gtk_drop_target_get_drop)
* GtkDropTarget:drop: (attributes org.gtk.Property.get=gtk_drop_target_get_drop) (skip)
*
* The `GdkDrop` that is currently being performed.
*
* Deprecated: 4.4: Use [property@Gtk.DropTarget:current-drop] instead
*/
properties[PROP_DROP] =
g_param_spec_object ("drop",
P_("Drop"),
P_("Current drop"),
GDK_TYPE_DROP,
GTK_PARAM_READABLE | G_PARAM_DEPRECATED);
/**
* GtkDropTarget:current-drop: (attributes org.gtk.Property.get=gtk_drop_target_get_current_drop)
*
* The `GdkDrop` that is currently being performed.
*
* Since: 4.4
*/
properties[PROP_CURRENT_DROP] =
g_param_spec_object ("current-drop",
P_("Current drop"),
P_("Current drop"),
GDK_TYPE_DROP,
GTK_PARAM_READABLE);
/**
@ -1010,6 +1030,8 @@ gtk_drop_target_get_preload (GtkDropTarget *self)
* If no drop operation is going on, %NULL is returned.
*
* Returns: (nullable) (transfer none): The current drop
*
* Deprecated: 4.4: Use [method@Gtk.DropTarget.get_current_drop] instead
*/
GdkDrop *
gtk_drop_target_get_drop (GtkDropTarget *self)
@ -1019,6 +1041,26 @@ gtk_drop_target_get_drop (GtkDropTarget *self)
return self->drop;
}
/**
* gtk_drop_target_get_current_drop: (attributes org.gtk.Method.get_property=current-drop)
* @self: a `GtkDropTarget`
*
* Gets the currently handled drop operation.
*
* If no drop operation is going on, %NULL is returned.
*
* Returns: (nullable) (transfer none): The current drop
*
* Since: 4.4
*/
GdkDrop *
gtk_drop_target_get_current_drop (GtkDropTarget *self)
{
g_return_val_if_fail (GTK_IS_DROP_TARGET (self), NULL);
return self->drop;
}
/**
* gtk_drop_target_get_value: (attributes org.gtk.Method.get_property=value)
* @self: a `GtkDropTarget`
@ -1044,7 +1086,7 @@ gtk_drop_target_get_value (GtkDropTarget *self)
*
* Rejects the ongoing drop operation.
*
* If no drop operation is ongoing, i.e when [property@Gtk.DropTarget:drop]
* If no drop operation is ongoing, i.e when [property@Gtk.DropTarget:current-drop]
* is %NULL, this function does nothing.
*
* This function should be used when delaying the decision
@ -1061,3 +1103,4 @@ gtk_drop_target_reject (GtkDropTarget *self)
gtk_drop_target_end_drop (self);
}

5
gtk/gtkdroptarget.h
View File

@ -71,9 +71,12 @@ void gtk_drop_target_set_preload (GtkDropTarget
GDK_AVAILABLE_IN_ALL
gboolean gtk_drop_target_get_preload (GtkDropTarget *self);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_4_FOR(gtk_drop_target_get_current_drop)
GdkDrop * gtk_drop_target_get_drop (GtkDropTarget *self);
GDK_AVAILABLE_IN_4_4
GdkDrop * gtk_drop_target_get_current_drop (GtkDropTarget *self);
GDK_AVAILABLE_IN_ALL
const GValue * gtk_drop_target_get_value (GtkDropTarget *self);

4
gtk/gtknotebook.c
View File

@ -3379,7 +3379,7 @@ gtk_notebook_drag_motion (GtkDropTarget *dest,
double y,
GtkNotebook *notebook)
{
GdkDrag *drag = gdk_drop_get_drag (gtk_drop_target_get_drop (dest));
GdkDrag *drag = gdk_drop_get_drag (gtk_drop_target_get_current_drop (dest));
GtkNotebook *source;
notebook->mouse_x = x;
@ -3404,7 +3404,7 @@ gtk_notebook_drag_drop (GtkDropTarget *dest,
double y,
GtkNotebook *self)
{
GdkDrag *drag = gdk_drop_get_drag (gtk_drop_target_get_drop (dest));
GdkDrag *drag = gdk_drop_get_drag (gtk_drop_target_get_current_drop (dest));
GtkNotebook *source;
GtkNotebookPage *page = g_value_get_object (value);

2
gtk/gtkplacessidebar.c
View File

@ -1851,7 +1851,7 @@ drag_drop_callback (GtkDropTarget *target,
emit_drag_perform_drop (sidebar,
dest_file,
g_value_get_boxed (value),
gdk_drop_get_actions (gtk_drop_target_get_drop (target)));
gdk_drop_get_actions (gtk_drop_target_get_current_drop (target)));
g_object_unref (dest_file);
}