guint vscroll_policy : 1;
guint cursor_handle_dragged : 1;
guint selection_handle_dragged : 1;
- guint populate_toolbar : 1;
+ guint populate_all : 1;
};
struct _GtkTextPendingScroll
PROP_VSCROLL_POLICY,
PROP_INPUT_PURPOSE,
PROP_INPUT_HINTS,
- PROP_POPULATE_TOOLBAR
+ PROP_POPULATE_ALL
};
static void gtk_text_view_finalize (GObject *object);
GTK_INPUT_HINT_NONE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /** GtkTextView:populate-toolbar:
+ /** GtkTextView:populate-all:
*
- * If ::populate-toolbar is %TRUE, the #GtkTextView::populate-popup
- * signal is also emitted for touch popups. In this case, the
- * container is a #GtkToolbar.
+ * If ::populate-all is %TRUE, the #GtkTextView::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));
/**
* GtkTextView::populate-popup:
* @text_view: The text view 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
+ * The ::populate-popup signal gets emitted before showing the
* context menu of the text view.
*
* If you need to add items to the context menu, connect
- * to this signal and append your items to the @popup.
+ * to this signal and append your items to the @popup, which
+ * will be a #GtkMenu in this case.
*
* If #GtkEntry::populate-toolbar is %TRUE, this signal will
* also be emitted to populate touch popups. In this case,
- * @popup will be a toolbar instead of a menu.
+ * @popup will be a different container, e.g. a #GtkToolbar.
+ *
+ * The signal handler should not make assumptions about the
+ * type of @widget, but check whether @popup is a #GtkMenu
+ * or #GtkToolbar or another kind of container.
*/
signals[POPULATE_POPUP] =
g_signal_new (I_("populate-popup"),
gtk_text_view_set_input_hints (text_view, g_value_get_flags (value));
break;
- case PROP_POPULATE_TOOLBAR:
- text_view->priv->populate_toolbar = g_value_get_boolean (value);
+ case PROP_POPULATE_ALL:
+ text_view->priv->populate_all = g_value_get_boolean (value);
break;
default:
g_value_set_flags (value, gtk_text_view_get_input_hints (text_view));
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:
{
const gchar *signal = g_object_get_data (G_OBJECT (item), "gtk-signal");
g_signal_emit_by_name (text_view, signal);
- gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (text_view->priv->selection_bubble));
+ _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (text_view->priv->selection_bubble));
}
static void
gtk_widget_destroy (priv->selection_bubble);
window = gtk_widget_get_window (GTK_WIDGET (text_view));
- 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 (text_view, toolbar, GTK_STOCK_PASTE, "paste-clipboard",
can_insert && has_clipboard);
- if (priv->populate_toolbar)
+ if (priv->populate_all)
g_signal_emit (text_view, signals[POPULATE_POPUP], 0, toolbar);
gtk_text_view_get_selection_rect (text_view, &rect);
rect.x -= priv->xoffset;
rect.y -= priv->yoffset;
- gtk_bubble_window_popup (GTK_BUBBLE_WINDOW (priv->selection_bubble),
+ _gtk_bubble_window_popup (GTK_BUBBLE_WINDOW (priv->selection_bubble),
window, &rect, GTK_POS_TOP);
priv->selection_bubble_timeout_id = 0;
priv = text_view->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)
{
if (dx != 0 || dy != 0)
{
- gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
+ if (priv->selection_bubble)
+ _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
gdk_window_scroll (win->bin_window, dx, dy);
}
}