dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: small code reorganization. 

Signal handler to the end with other private functions.
This commit is contained in:
Jehan 2022-02-01 23:36:40 +01:00
parent 55b3e3a336
commit 02220766b0
1 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
app/widgets/gimpcontainerpopup.c
View File

@ -61,6 +61,10 @@ static void gimp_container_popup_view_type_toggled(GtkWidget *button,
static void gimp_container_popup_dialog_clicked (GtkWidget *button,
GimpContainerPopup *popup);
static void gimp_container_popup_context_changed (GimpContext *context,
GimpViewable *viewable,
GimpContainerPopup *popup);
G_DEFINE_TYPE (GimpContainerPopup, gimp_container_popup, GIMP_TYPE_POPUP)
@ -121,37 +125,6 @@ gimp_container_popup_confirm (GimpPopup *popup)
GIMP_POPUP_CLASS (parent_class)->confirm (popup);
}
static void
gimp_container_popup_context_changed (GimpContext *context,
GimpViewable *viewable,
GimpContainerPopup *popup)
{
GdkEvent *current_event;
GtkWidget *current_widget = GTK_WIDGET (popup);
gboolean confirm = FALSE;
current_event = gtk_get_current_event ();
if (current_event && gtk_widget_get_window (current_widget))
{
GdkWindow *event_window = gdk_window_get_effective_toplevel (((GdkEventAny *) current_event)->window);
GdkWindow *popup_window = gdk_window_get_effective_toplevel (gtk_widget_get_window (current_widget));
/* We need to differentiate a context change as a consequence of
* an event on another widget.
*/
if ((((GdkEventAny *) current_event)->type == GDK_BUTTON_PRESS ||
((GdkEventAny *) current_event)->type == GDK_BUTTON_RELEASE) &&
event_window == popup_window)
confirm = TRUE;
gdk_event_free (current_event);
}
if (confirm)
g_signal_emit_by_name (popup, "confirm");
}
GtkWidget *
gimp_container_popup_new (GimpContainer *container,
GimpContext *context,
@ -433,3 +406,34 @@ gimp_container_popup_dialog_clicked (GtkWidget *button,
popup->dialog_identifier);
g_signal_emit_by_name (popup, "confirm");
}
static void
gimp_container_popup_context_changed (GimpContext *context,
GimpViewable *viewable,
GimpContainerPopup *popup)
{
GdkEvent *current_event;
GtkWidget *current_widget = GTK_WIDGET (popup);
gboolean confirm = FALSE;
current_event = gtk_get_current_event ();
if (current_event && gtk_widget_get_window (current_widget))
{
GdkWindow *event_window = gdk_window_get_effective_toplevel (((GdkEventAny *) current_event)->window);
GdkWindow *popup_window = gdk_window_get_effective_toplevel (gtk_widget_get_window (current_widget));
/* We need to differentiate a context change as a consequence of
* an event on another widget.
*/
if ((((GdkEventAny *) current_event)->type == GDK_BUTTON_PRESS ||
((GdkEventAny *) current_event)->type == GDK_BUTTON_RELEASE) &&
event_window == popup_window)
confirm = TRUE;
gdk_event_free (current_event);
}
if (confirm)
g_signal_emit_by_name (popup, "confirm");
}