[gtk/wip/matthiasc/popup2] Rename gdk_device_get_surface_at_position_double
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/popup2] Rename gdk_device_get_surface_at_position_double
- Date: Tue, 26 Mar 2019 00:45:55 +0000 (UTC)
commit 4bb9827f33020c143ef9a04c176db89c7687db28
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Mar 25 20:44:37 2019 -0400
Rename gdk_device_get_surface_at_position_double
We can drop the double suffix now.
demos/gtk-demo/changedisplay.c | 2 +-
docs/reference/gdk/gdk4-sections.txt | 2 +-
gdk/gdkdevice.c | 8 ++++----
gdk/gdkdevice.h | 8 +++-----
gdk/wayland/gdksurface-wayland.c | 4 ++--
gdk/win32/gdkdevicemanager-win32.c | 2 +-
gtk/gtktooltip.c | 2 +-
gtk/inspector/inspect-button.c | 2 +-
8 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c
index 0a963fe157..5f5717c43d 100644
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -71,7 +71,7 @@ find_toplevel_at_pointer (GdkDisplay *display)
GdkSurface *pointer_window;
GtkWidget *widget = NULL;
- pointer_window = gdk_device_get_surface_at_position_double (gtk_get_current_event_device (), NULL, NULL);
+ pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (), NULL, NULL);
if (pointer_window)
widget = GTK_WIDGET (gtk_root_get_for_surface (pointer_window));
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 427294d5ed..9fe2f8552f 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -498,7 +498,7 @@ gdk_device_ungrab
<SUBSECTION>
gdk_device_get_state
gdk_device_get_position
-gdk_device_get_surface_at_position_double
+gdk_device_get_surface_at_position
gdk_device_get_history
gdk_device_free_history
GdkTimeCoord
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 5c41d72e4e..ebd20839f7 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -568,7 +568,7 @@ gdk_device_get_position (GdkDevice *device,
}
/**
- * gdk_device_get_surface_at_position_double:
+ * gdk_device_get_surface_at_position:
* @device: pointer #GdkDevice to query info to.
* @win_x: (out) (allow-none): return location for the X coordinate of the device location,
* relative to the surface origin, or %NULL.
@@ -587,9 +587,9 @@ gdk_device_get_position (GdkDevice *device,
* device position, or %NULL.
**/
GdkSurface *
-gdk_device_get_surface_at_position_double (GdkDevice *device,
- gdouble *win_x,
- gdouble *win_y)
+gdk_device_get_surface_at_position (GdkDevice *device,
+ double *win_x,
+ double *win_y)
{
gdouble tmp_x, tmp_y;
GdkSurface *surface;
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 24150e5afb..3ae1c209ca 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -171,11 +171,9 @@ void gdk_device_get_position (GdkDevice *device,
double *x,
double *y);
GDK_AVAILABLE_IN_ALL
-GdkSurface *
- gdk_device_get_surface_at_position_double
- (GdkDevice *device,
- gdouble *win_x,
- gdouble *win_y);
+GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device,
+ double *win_x,
+ double *win_y);
GDK_AVAILABLE_IN_ALL
gboolean gdk_device_get_history (GdkDevice *device,
GdkSurface *surface,
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index 943b40d85c..87d24373bd 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -2423,14 +2423,14 @@ gdk_wayland_surface_map (GdkSurface *surface)
GDK_SURFACE_IMPL_WAYLAND (attached_grab_surface->impl);
grab_device = gdk_seat_get_pointer (attached_impl->grab_input_seat);
transient_for =
- gdk_device_get_surface_at_position_double (grab_device, NULL, NULL);
+ gdk_device_get_surface_at_position (grab_device, NULL, NULL);
}
}
else
{
grab_device = gdk_seat_get_pointer (impl->grab_input_seat);
transient_for =
- gdk_device_get_surface_at_position_double (grab_device, NULL, NULL);
+ gdk_device_get_surface_at_position (grab_device, NULL, NULL);
}
if (transient_for)
diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index a7043b40b4..cc396f0563 100644
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -902,7 +902,7 @@ gdk_input_other_event (GdkDisplay *display,
}
device_manager = GDK_DEVICE_MANAGER_WIN32 (_gdk_device_manager);
- window = gdk_device_get_surface_at_position_double (device_manager->core_pointer, &x, &y);
+ window = gdk_device_get_surface_at_position (device_manager->core_pointer, &x, &y);
if (window)
g_object_ref (window);
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 15de828dc4..d751948f31 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -394,7 +394,7 @@ gtk_tooltip_trigger_tooltip_query (GtkWidget *widget)
/* Trigger logic as if the mouse moved */
device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
- surface = gdk_device_get_surface_at_position_double (device, &x, &y);
+ surface = gdk_device_get_surface_at_position (device, &x, &y);
if (!surface)
return;
diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c
index 83867b8b8d..76e52f4df1 100644
--- a/gtk/inspector/inspect-button.c
+++ b/gtk/inspector/inspect-button.c
@@ -43,7 +43,7 @@ find_widget_at_pointer (GdkDevice *device)
GtkWidget *widget = NULL;
GdkSurface *pointer_surface;
- pointer_surface = gdk_device_get_surface_at_position_double (device, NULL, NULL);
+ pointer_surface = gdk_device_get_surface_at_position (device, NULL, NULL);
if (pointer_surface)
widget = gtk_root_get_for_surface (pointer_surface);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]