Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gtk
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1,147
Issues
1,147
List
Boards
Labels
Milestones
Merge Requests
98
Merge Requests
98
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GNOME
gtk
Commits
ee73e27f
Commit
ee73e27f
authored
Jul 27, 2015
by
Patrick Griffis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Fix building
Broken by
6d04183c
and
6ac07a2e
parent
49a596aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
gdk/quartz/GdkQuartzNSWindow.c
gdk/quartz/GdkQuartzNSWindow.c
+3
-3
gtk/gtkdnd-quartz.c
gtk/gtkdnd-quartz.c
+4
-3
No files found.
gdk/quartz/GdkQuartzNSWindow.c
View file @
ee73e27f
...
...
@@ -665,14 +665,14 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
event
->
dnd
.
send_event
=
FALSE
;
event
->
dnd
.
context
=
g_object_ref
(
_gdk_quartz_drag_source_context
);
screen
=
gdk_window_get_screen
(
event
.
dnd
.
window
);
screen
=
gdk_window_get_screen
(
event
->
dnd
.
window
);
if
(
screen
)
{
GList
*
windows
,
*
list
;
gint
gx
,
gy
;
event
.
dnd
.
context
->
dest_window
=
NULL
;
event
->
dnd
.
context
->
dest_window
=
NULL
;
windows
=
gdk_screen_get_toplevel_windows
(
screen
);
_gdk_quartz_window_nspoint_to_gdk_xy
(
aPoint
,
&
gx
,
&
gy
);
...
...
@@ -688,7 +688,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
wh
=
gdk_window_get_height
(
win
);
if
(
gx
>
wx
&&
gy
>
wy
&&
gx
<=
wx
+
ww
&&
gy
<=
wy
+
wh
)
event
.
dnd
.
context
->
dest_window
=
win
;
event
->
dnd
.
context
->
dest_window
=
win
;
}
}
...
...
gtk/gtkdnd-quartz.c
View file @
ee73e27f
...
...
@@ -62,7 +62,8 @@ static void gtk_drag_source_site_destroy (gpointer data);
static
GtkDragSourceInfo
*
gtk_drag_get_source_info
(
GdkDragContext
*
context
,
gboolean
create
);
static
void
gtk_drag_drop_finished
(
GtkDragSourceInfo
*
info
);
static
void
gtk_drag_drop_finished
(
GtkDragSourceInfo
*
info
,
GtkDragResult
result
);
extern
GdkDragContext
*
gdk_quartz_drag_source_context
();
/* gdk/quartz/gdkdnd-quartz.c */
...
...
@@ -1399,7 +1400,7 @@ gtk_drag_cancel (GdkDragContext *context)
info
=
gtk_drag_get_source_info
(
context
,
FALSE
);
if
(
info
!=
NULL
)
gtk_drag_drop_finished
(
info
);
gtk_drag_drop_finished
(
info
,
GTK_DRAG_RESULT_ERROR
);
}
static
gboolean
...
...
@@ -2068,7 +2069,7 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info,
if
(
!
success
)
g_signal_emit_by_name
(
info
->
source_widget
,
"drag-failed"
,
info
->
context
,
GTK_DRAG_RESULT_NO_TARGET
,
&
success
);
info
->
context
,
result
,
&
success
);
if
(
success
&&
info
->
delete
)
g_signal_emit_by_name
(
info
->
source_widget
,
"drag-data-delete"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment