[gtk] window: Merge some functions into their only callers
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] window: Merge some functions into their only callers
- Date: Sun, 21 Jul 2019 10:46:23 +0000 (UTC)
commit 8beea4d958f47a7f864c2d7eb9e2eb2a120f9149
Author: Timm Bäder <mail baedert org>
Date: Sun Jul 21 10:52:12 2019 +0200
window: Merge some functions into their only callers
So it's clear we only add or remove the pointerfocus-es in
_update_pointer_focus.
gtk/gtkwindow.c | 37 ++++++++++---------------------------
1 file changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 963d1fa088..723d261127 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -9233,30 +9233,6 @@ gtk_window_unexport_handle (GtkWindow *window)
G_OBJECT_TYPE_NAME (priv->surface));
}
-static void
-gtk_window_add_pointer_focus (GtkWindow *window,
- GtkPointerFocus *focus)
-{
- GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
-
- priv->foci = g_list_prepend (priv->foci, gtk_pointer_focus_ref (focus));
-}
-
-static void
-gtk_window_remove_pointer_focus (GtkWindow *window,
- GtkPointerFocus *focus)
-{
- GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
- GList *pos;
-
- pos = g_list_find (priv->foci, focus);
- if (!pos)
- return;
-
- priv->foci = g_list_remove (priv->foci, focus);
- gtk_pointer_focus_unref (focus);
-}
-
static GtkPointerFocus *
gtk_window_lookup_pointer_focus (GtkWindow *window,
GdkDevice *device,
@@ -9317,6 +9293,7 @@ gtk_window_update_pointer_focus (GtkWindow *window,
gdouble x,
gdouble y)
{
+ GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
GtkPointerFocus *focus;
focus = gtk_window_lookup_pointer_focus (window, device, sequence);
@@ -9331,7 +9308,14 @@ gtk_window_update_pointer_focus (GtkWindow *window,
}
else
{
- gtk_window_remove_pointer_focus (window, focus);
+ GList *pos;
+
+ pos = g_list_find (priv->foci, focus);
+ if (pos)
+ {
+ priv->foci = g_list_remove (priv->foci, focus);
+ gtk_pointer_focus_unref (focus);
+ }
}
gtk_pointer_focus_unref (focus);
@@ -9339,8 +9323,7 @@ gtk_window_update_pointer_focus (GtkWindow *window,
else if (target)
{
focus = gtk_pointer_focus_new (window, target, device, sequence, x, y);
- gtk_window_add_pointer_focus (window, focus);
- gtk_pointer_focus_unref (focus);
+ priv->foci = g_list_prepend (priv->foci, focus);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]