[gtk/wip/tooltip-api: 21/22] inspector: Don't use the ::query-tooltip signal
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/tooltip-api: 21/22] inspector: Don't use the ::query-tooltip signal
- Date: Sun, 10 May 2020 03:27:57 +0000 (UTC)
commit a123d99fcd0a58ff66a4dd50ca230d007ebd8bbc
Author: Matthias Clasen <mclasen redhat com>
Date: Sat May 9 22:49:55 2020 -0400
inspector: Don't use the ::query-tooltip signal
Use the vfunc, the signal is going away.
gtk/inspector/css-editor.c | 16 +++++++++-------
gtk/inspector/css-editor.ui | 3 +--
2 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c
index 85028fc7e7..078fdbf671 100644
--- a/gtk/inspector/css-editor.c
+++ b/gtk/inspector/css-editor.c
@@ -65,13 +65,13 @@ css_error_free (gpointer data)
}
static gboolean
-query_tooltip_cb (GtkWidget *widget,
- gint x,
- gint y,
- gboolean keyboard_tip,
- GtkTooltip *tooltip,
- GtkInspectorCssEditor *ce)
+gtk_css_editor_query_tooltip (GtkWidget *widget,
+ int x,
+ int y,
+ gboolean keyboard_tip,
+ GtkTooltip *tooltip)
{
+ GtkInspectorCssEditor *ce = GTK_INSPECTOR_CSS_EDITOR (widget);
GtkTextIter iter;
GList *l;
@@ -86,6 +86,7 @@ query_tooltip_cb (GtkWidget *widget,
{
gint bx, by, trailing;
+ gtk_widget_translate_coordinates (widget, ce->priv->view, x, y, &x, &y);
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (ce->priv->view), GTK_TEXT_WINDOW_TEXT,
x, y, &bx, &by);
gtk_text_view_get_iter_at_position (GTK_TEXT_VIEW (ce->priv->view), &iter, &trailing, bx, by);
@@ -406,6 +407,8 @@ gtk_inspector_css_editor_class_init (GtkInspectorCssEditorClass *klass)
object_class->constructed = constructed;
object_class->finalize = finalize;
+ widget_class->query_tooltip = gtk_css_editor_query_tooltip;
+
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/css-editor.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssEditor, text);
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssEditor, view);
@@ -413,7 +416,6 @@ gtk_inspector_css_editor_class_init (GtkInspectorCssEditorClass *klass)
gtk_widget_class_bind_template_callback (widget_class, disable_toggled);
gtk_widget_class_bind_template_callback (widget_class, save_clicked);
gtk_widget_class_bind_template_callback (widget_class, text_changed);
- gtk_widget_class_bind_template_callback (widget_class, query_tooltip_cb);
}
void
diff --git a/gtk/inspector/css-editor.ui b/gtk/inspector/css-editor.ui
index dc4649904c..19a3dac74b 100644
--- a/gtk/inspector/css-editor.ui
+++ b/gtk/inspector/css-editor.ui
@@ -20,6 +20,7 @@
</object>
<template class="GtkInspectorCssEditor" parent="GtkBox">
<property name="orientation">vertical</property>
+ <property name="has-tooltip">1</property>
<child>
<object class="GtkBox">
<property name="spacing">6</property>
@@ -57,8 +58,6 @@
<property name="monospace">1</property>
<property name="left-margin">6</property>
<property name="right-margin">6</property>
- <property name="has-tooltip">1</property>
- <signal name="query-tooltip" handler="query_tooltip_cb"/>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]