diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-05-09 23:24:59 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-05-09 23:24:59 -0400 |
| commit | abcf2e3bf712208249dfa8b4d54d35e98cc2ba72 (patch) | |
| tree | 98b56bd1c150a89aa4cffdc4509321c734a73b10 | |
| parent | a123d99fcd0a58ff66a4dd50ca230d007ebd8bbc (diff) | |
| download | gtk+-wip/tooltip-api.tar.gz | |
node-editor: Don't use the ::query-tooltip signalwip/tooltip-api
Use the vfunc, the signal is going away.
| -rw-r--r-- | demos/node-editor/node-editor-window.c | 15 | ||||
| -rw-r--r-- | demos/node-editor/node-editor-window.ui | 3 |
2 files changed, 9 insertions, 9 deletions
diff --git a/demos/node-editor/node-editor-window.c b/demos/node-editor/node-editor-window.c index 06214d282c..3dd56d23f8 100644 --- a/demos/node-editor/node-editor-window.c +++ b/demos/node-editor/node-editor-window.c @@ -273,13 +273,13 @@ text_changed (GtkTextBuffer *buffer, } static gboolean -text_view_query_tooltip_cb (GtkWidget *widget, - int x, - int y, - gboolean keyboard_tip, - GtkTooltip *tooltip, - NodeEditorWindow *self) +node_editor_query_tooltip (GtkWidget *widget, + int x, + int y, + gboolean keyboard_tip, + GtkTooltip *tooltip) { + NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget); GtkTextIter iter; guint i; GString *text; @@ -295,6 +295,7 @@ text_view_query_tooltip_cb (GtkWidget *widget, { gint bx, by, trailing; + gtk_widget_translate_coordinates (widget, self->text_view, x, y, &x, &y); gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (self->text_view), GTK_TEXT_WINDOW_TEXT, x, y, &bx, &by); gtk_text_view_get_iter_at_position (GTK_TEXT_VIEW (self->text_view), &iter, &trailing, bx, by); @@ -757,6 +758,7 @@ node_editor_window_class_init (NodeEditorWindowClass *class) widget_class->realize = node_editor_window_realize; widget_class->unrealize = node_editor_window_unrealize; + widget_class->query_tooltip = node_editor_query_tooltip; gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, text_view); gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, picture); @@ -767,7 +769,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class) gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_name_entry); gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_save_button); - gtk_widget_class_bind_template_callback (widget_class, text_view_query_tooltip_cb); gtk_widget_class_bind_template_callback (widget_class, open_cb); gtk_widget_class_bind_template_callback (widget_class, save_cb); gtk_widget_class_bind_template_callback (widget_class, export_image_cb); diff --git a/demos/node-editor/node-editor-window.ui b/demos/node-editor/node-editor-window.ui index 3a8373a080..2384855c08 100644 --- a/demos/node-editor/node-editor-window.ui +++ b/demos/node-editor/node-editor-window.ui @@ -84,6 +84,7 @@ <property name="default-width">1024</property> <property name="default-height">768</property> <property name="focus-widget">text_view</property> + <property name="has-tooltip">1</property> <child type="titlebar"> <object class="GtkHeaderBar" id="header"> <property name="show-title-buttons">1</property> @@ -138,8 +139,6 @@ <property name="left-margin">6</property> <property name="right-margin">6</property> <property name="bottom-margin">6</property> - <property name="has-tooltip">1</property> - <signal name="query-tooltip" handler="text_view_query_tooltip_cb"/> <style> <class name="editor" /> </style> |