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

app: clicking on the GimpPopup parent emits a "confirm" signal. 

Clicking on the parent (typically a button, as in the GimpPickableButton case
used in GEGL operations' generated GUI) used to emit "cancel". Let's have it
emit "confirm" instead.
Also it makes for a "confirm" interaction through pointer action as there were
none until now (only key "confirm", e.g. Enter or Space keys), unless
implemented in a child class (e.g. GimpPickablePopup would emit "confirm" on
activate-item of the tree view widgets, e.g. when double-clicking an item; that
was not ideally discoverable).
This commit is contained in:
Jehan 2023-08-26 18:50:53 +02:00
parent 8be4592e38
commit 8059de502a
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/widgets/gimppopup.c
View File

@ -38,6 +38,11 @@ enum
LAST_SIGNAL LAST_SIGNAL
}; };
typedef struct _GimpPopupPrivate
{
GtkWidget *parent;
} GimpPopupPrivate;
static gboolean gimp_popup_map_event (GtkWidget *widget, static gboolean gimp_popup_map_event (GtkWidget *widget,
GdkEventAny *event); GdkEventAny *event);
@ -50,7 +55,7 @@ static void gimp_popup_real_cancel (GimpPopup *popup);
static void gimp_popup_real_confirm (GimpPopup *popup); static void gimp_popup_real_confirm (GimpPopup *popup);
G_DEFINE_TYPE (GimpPopup, gimp_popup, GTK_TYPE_WINDOW) G_DEFINE_TYPE_WITH_PRIVATE (GimpPopup, gimp_popup, GTK_TYPE_WINDOW)
#define parent_class gimp_popup_parent_class #define parent_class gimp_popup_parent_class
@ -175,7 +180,8 @@ gimp_popup_button_press (GtkWidget *widget,
GdkEventButton *bevent) GdkEventButton *bevent)
{ {
GtkWidget *event_widget; GtkWidget *event_widget;
gboolean cancel = FALSE; gboolean cancel = FALSE;
gboolean confirm = FALSE;
event_widget = gtk_get_event_widget ((GdkEvent *) bevent); event_widget = gtk_get_event_widget ((GdkEvent *) bevent);
@ -200,15 +206,22 @@ gimp_popup_button_press (GtkWidget *widget,
} }
else if (gtk_widget_get_toplevel (event_widget) != widget) else if (gtk_widget_get_toplevel (event_widget) != widget)
{ {
GimpPopupPrivate *priv;
/* the event was on a gimp widget, but not inside the popup */ /* the event was on a gimp widget, but not inside the popup */
cancel = TRUE; priv = gimp_popup_get_instance_private (GIMP_POPUP (widget));
if (event_widget == priv->parent || gtk_widget_is_ancestor (event_widget, priv->parent))
confirm = TRUE;
else
cancel = TRUE;
} }
if (cancel) if (cancel)
g_signal_emit (widget, popup_signals[CANCEL], 0); g_signal_emit (widget, popup_signals[CANCEL], 0);
else if (confirm)
g_signal_emit (widget, popup_signals[CONFIRM], 0);
return cancel; return (cancel || confirm);
} }
static gboolean static gboolean
@ -275,23 +288,39 @@ gimp_popup_real_confirm (GimpPopup *popup)
gtk_widget_destroy (widget); gtk_widget_destroy (widget);
} }
/**
* gimp_popup_show:
* @popup:
* @widget: the parent widget which will determine @popup location.
*
* Shows @popup above @widget. Its placement will be determined relatively to
* @widget.
* Moreover clicking outside @popup but within @widget will be considered a
* "confirm" signal. Typically @widget would be a button. A typical UX could be:
* clicking it once would show the popup; clicking it again would confirm the
* choice within the popup.
*/
void void
gimp_popup_show (GimpPopup *popup, gimp_popup_show (GimpPopup *popup,
GtkWidget *widget) GtkWidget *widget)
{ {
GdkDisplay *display; GimpPopupPrivate *priv;
GdkMonitor *monitor; GdkDisplay *display;
GtkRequisition requisition; GdkMonitor *monitor;
GtkAllocation allocation; GtkRequisition requisition;
GdkRectangle rect; GtkAllocation allocation;
gint orig_x; GdkRectangle rect;
gint orig_y; gint orig_x;
gint x; gint orig_y;
gint y; gint x;
gint y;
g_return_if_fail (GIMP_IS_POPUP (popup)); g_return_if_fail (GIMP_IS_POPUP (popup));
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
priv = gimp_popup_get_instance_private (popup);
priv->parent = widget;
gtk_widget_get_preferred_size (GTK_WIDGET (popup), &requisition, NULL); gtk_widget_get_preferred_size (GTK_WIDGET (popup), &requisition, NULL);
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);