guint truncate_multiline : 1;
guint cursor_handle_dragged : 1;
guint selection_handle_dragged : 1;
- guint populate_toolbar : 1;
+ guint populate_all : 1;
};
struct _EntryIconInfo
PROP_INPUT_PURPOSE,
PROP_INPUT_HINTS,
PROP_ATTRIBUTES,
- PROP_POPULATE_TOOLBAR
+ PROP_POPULATE_ALL
};
static guint signals[LAST_SIGNAL] = { 0 };
PANGO_TYPE_ATTR_LIST,
GTK_PARAM_READWRITE));
- /** GtkEntry:populate-toolbar:
+ /** GtkEntry:populate-all:
*
- * If ::populate-toolbar is %TRUE, the #GtkEntry::populate-popup
+ * If ::populate-all is %TRUE, the #GtkEntry::populate-popup
* signal is also emitted for touch popups.
*
* Since: 3.8
*/
g_object_class_install_property (gobject_class,
- PROP_POPULATE_TOOLBAR,
- g_param_spec_boolean ("populate-toolbar",
- P_("Populate toolbar"),
+ PROP_POPULATE_ALL,
+ g_param_spec_boolean ("populate-all",
+ P_("Populate all"),
P_("Whether to emit ::populate-popup for touch popups"),
FALSE,
GTK_PARAM_READWRITE));
/**
* GtkEntry::populate-popup:
* @entry: The entry on which the signal is emitted
- * @popup: the menu or toolbar that is being populated
+ * @popup: the container that is being populated
*
* The ::populate-popup signal gets emitted before showing the
* context menu of the entry.
*
* If you need to add items to the context menu, connect
- * to this signal and append your items to the @widget.
+ * to this signal and append your items to the @widget, which
+ * will be a #GtkMenu in this case.
*
- * If #GtkEntry::populate-toolbar is %TRUE, this signal will
+ * If #GtkEntry::populate-all is %TRUE, this signal will
* also be emitted to populate touch popups. In this case,
- * @widget will be a toolbar instead of a menu.
+ * @widget will be a different container, e.g. a #GtkToolbar.
+ * The signal handler should not make assumptions about the
+ * type of @widget.
*/
signals[POPULATE_POPUP] =
g_signal_new (I_("populate-popup"),
gtk_entry_set_attributes (entry, g_value_get_boxed (value));
break;
- case PROP_POPULATE_TOOLBAR:
- entry->priv->populate_toolbar = g_value_get_boolean (value);
+ case PROP_POPULATE_ALL:
+ entry->priv->populate_all = g_value_get_boolean (value);
break;
case PROP_SCROLL_OFFSET:
g_value_set_boxed (value, priv->attrs);
break;
- case PROP_POPULATE_TOOLBAR:
- g_value_set_boolean (value, priv->populate_toolbar);
+ case PROP_POPULATE_ALL:
+ g_value_set_boolean (value, priv->populate_all);
break;
default:
text = gtk_entry_buffer_get_text (get_buffer (entry));
length = gtk_entry_buffer_get_length (get_buffer (entry));
- if (end_pos < 0)
+ if (end_pos < 0 || end_pos > length)
end_pos = length;
if (start_pos > length)
start_pos = length;
{
const gchar *signal = g_object_get_data (G_OBJECT (item), "gtk-signal");
g_signal_emit_by_name (entry, signal);
- gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (entry->priv->selection_bubble));
+ _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (entry->priv->selection_bubble));
}
static void
if (priv->selection_bubble)
gtk_widget_destroy (priv->selection_bubble);
- priv->selection_bubble = gtk_bubble_window_new ();
+ priv->selection_bubble = _gtk_bubble_window_new ();
toolbar = GTK_WIDGET (gtk_toolbar_new ());
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_TEXT);
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
append_bubble_action (entry, toolbar, GTK_STOCK_PASTE, "paste-clipboard",
priv->editable && has_clipboard);
- if (priv->populate_toolbar)
+ if (priv->populate_all)
g_signal_emit (entry, signals[POPULATE_POPUP], 0, toolbar);
gtk_widget_get_allocation (GTK_WIDGET (entry), &allocation);
rect.width = 0;
}
- gtk_bubble_window_popup (GTK_BUBBLE_WINDOW (priv->selection_bubble),
- priv->text_area, &rect, GTK_POS_TOP);
+ _gtk_bubble_window_popup (GTK_BUBBLE_WINDOW (priv->selection_bubble),
+ priv->text_area, &rect, GTK_POS_TOP);
priv->selection_bubble_timeout_id = 0;
}
priv = entry->priv;
if (priv->selection_bubble)
- gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
+ _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
if (priv->selection_bubble_timeout_id)
{