[gtk+] button: Split out function
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] button: Split out function
- Date: Tue, 3 Dec 2013 01:00:57 +0000 (UTC)
commit 804be65a09d7e245deb99d17bb84f9f5470fe37f
Author: Benjamin Otte <otte redhat com>
Date: Mon Dec 2 13:41:15 2013 +0100
button: Split out function
This is in preparation of the following cleanup commits.
gtk/gtkbutton.c | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index ab7c819..21c537c 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1970,6 +1970,26 @@ gtk_button_touch (GtkWidget *widget,
return GDK_EVENT_PROPAGATE;
}
+static void
+gtk_button_do_release (GtkButton *button,
+ gboolean emit_clicked)
+{
+ GtkButtonPrivate *priv = button->priv;
+
+ if (priv->button_down)
+ {
+ priv->button_down = FALSE;
+
+ if (priv->activate_timeout)
+ return;
+
+ if (emit_clicked)
+ gtk_button_clicked (button);
+
+ gtk_button_update_state (button);
+ }
+}
+
static gboolean
gtk_button_grab_broken (GtkWidget *widget,
GdkEventGrabBroken *event)
@@ -2096,21 +2116,9 @@ touch_release_in_button (GtkButton *button)
static void
gtk_real_button_released (GtkButton *button)
{
- GtkButtonPrivate *priv = button->priv;
-
- if (priv->button_down)
- {
- priv->button_down = FALSE;
-
- if (priv->activate_timeout)
- return;
-
- if (priv->in_button ||
- touch_release_in_button (button))
- gtk_button_clicked (button);
-
- gtk_button_update_state (button);
- }
+ gtk_button_do_release (button,
+ button->priv->in_button ||
+ touch_release_in_button (button));
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]