mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-04 09:40:19 +00:00
Merge branch 'drag-cursor-tweak' into 'main'
dnd: Use the default cursor during motion Closes #6337 and #6511 See merge request GNOME/gtk!7058
This commit is contained in:
commit
cecde85faa
@ -50,18 +50,6 @@
|
|||||||
#include "gdkenumtypes.h"
|
#include "gdkenumtypes.h"
|
||||||
#include "gdkeventsprivate.h"
|
#include "gdkeventsprivate.h"
|
||||||
|
|
||||||
static struct {
|
|
||||||
GdkDragAction action;
|
|
||||||
const char *name;
|
|
||||||
GdkCursor *cursor;
|
|
||||||
} drag_cursors[] = {
|
|
||||||
{ GDK_ACTION_ASK, "dnd-ask", NULL },
|
|
||||||
{ GDK_ACTION_COPY, "copy", NULL },
|
|
||||||
{ GDK_ACTION_MOVE, "move", NULL },
|
|
||||||
{ GDK_ACTION_LINK, "alias", NULL },
|
|
||||||
{ 0, "no-drop", NULL },
|
|
||||||
};
|
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
PROP_0,
|
PROP_0,
|
||||||
PROP_CONTENT,
|
PROP_CONTENT,
|
||||||
@ -786,6 +774,18 @@ gdk_drag_handle_source_event (GdkEvent *event)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct {
|
||||||
|
GdkDragAction action;
|
||||||
|
const char *name;
|
||||||
|
GdkCursor *cursor;
|
||||||
|
} drag_cursors[] = {
|
||||||
|
{ 0, "default", NULL },
|
||||||
|
{ GDK_ACTION_ASK, "dnd-ask", NULL },
|
||||||
|
{ GDK_ACTION_COPY, "copy", NULL },
|
||||||
|
{ GDK_ACTION_MOVE, "move", NULL },
|
||||||
|
{ GDK_ACTION_LINK, "alias", NULL },
|
||||||
|
};
|
||||||
|
|
||||||
GdkCursor *
|
GdkCursor *
|
||||||
gdk_drag_get_cursor (GdkDrag *drag,
|
gdk_drag_get_cursor (GdkDrag *drag,
|
||||||
GdkDragAction action)
|
GdkDragAction action)
|
||||||
|
Loading…
Reference in New Issue
Block a user