Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

textview: Mind the lateral windows when setting handles/popovers positions

Browse Source 
If a textview had lateral windows that might displace the text window, the
handles and popovers would appear displaced. Those lateral windows aren't
affected by RTL/LTR settings, so just checking for left/top is ok here.
This commit is contained in:
Carlos Garnacho
2014-03-17 17:42:07 +01:00
parent 41b73e409f
commit 3693045566
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gtk/gtktextview.c
View File

@@ -4587,6 +4587,32 @@ emit_event_on_tags (GtkWidget *widget,
return retval; return retval;
} }
static void
_text_window_to_widget_coords (GtkTextView *text_view,
gint *x,
gint *y)
{
GtkTextViewPrivate *priv = text_view->priv;
if (priv->top_window)
(*y) += priv->top_window->requisition.height;
if (priv->left_window)
(*x) += priv->left_window->requisition.width;
}
static void
_widget_to_text_window_coords (GtkTextView *text_view,
gint *x,
gint *y)
{
GtkTextViewPrivate *priv = text_view->priv;
if (priv->top_window)
(*y) -= priv->top_window->requisition.height;
if (priv->left_window)
(*x) -= priv->left_window->requisition.width;
}
static void static void
gtk_text_view_set_handle_position (GtkTextView *text_view, gtk_text_view_set_handle_position (GtkTextView *text_view,
GtkTextIter *iter, GtkTextIter *iter,
@@ -4617,6 +4643,8 @@ gtk_text_view_set_handle_position (GtkTextView *text_view,
rect.x = CLAMP (x, 0, SCREEN_WIDTH (text_view)); rect.x = CLAMP (x, 0, SCREEN_WIDTH (text_view));
rect.y = CLAMP (y, 0, SCREEN_HEIGHT (text_view)); rect.y = CLAMP (y, 0, SCREEN_HEIGHT (text_view));
_text_window_to_widget_coords (text_view, &rect.x, &rect.y);
_gtk_text_handle_set_position (priv->text_handle, pos, &rect); _gtk_text_handle_set_position (priv->text_handle, pos, &rect);
} }
} }
@@ -4639,6 +4667,7 @@ gtk_text_view_show_magnifier (GtkTextView *text_view,
rect.x = x; rect.x = x;
rect.y = y; rect.y = y;
rect.width = rect.height = 1; rect.width = rect.height = 1;
_text_window_to_widget_coords (text_view, &rect.x, &rect.y);
_gtk_magnifier_set_coords (GTK_MAGNIFIER (priv->magnifier), x, y); _gtk_magnifier_set_coords (GTK_MAGNIFIER (priv->magnifier), x, y);
gtk_popover_set_pointing_to (GTK_POPOVER (priv->magnifier_popover), gtk_popover_set_pointing_to (GTK_POPOVER (priv->magnifier_popover),
@@ -4665,6 +4694,8 @@ gtk_text_view_handle_dragged (GtkTextHandle *handle,
buffer = get_buffer (text_view); buffer = get_buffer (text_view);
mode = _gtk_text_handle_get_mode (handle); mode = _gtk_text_handle_get_mode (handle);
_widget_to_text_window_coords (text_view, &x, &y);
gtk_text_view_selection_bubble_popup_unset (text_view); gtk_text_view_selection_bubble_popup_unset (text_view);
gtk_text_layout_get_iter_at_pixel (priv->layout, &iter, gtk_text_layout_get_iter_at_pixel (priv->layout, &iter,
x + priv->xoffset, x + priv->xoffset,
@@ -9008,6 +9039,8 @@ bubble_targets_received (GtkClipboard *clipboard,
rect.x -= priv->xoffset; rect.x -= priv->xoffset;
rect.y -= priv->yoffset; rect.y -= priv->yoffset;
_text_window_to_widget_coords (text_view, &rect.x, &rect.y);
gtk_popover_set_pointing_to (GTK_POPOVER (priv->selection_bubble), &rect); gtk_popover_set_pointing_to (GTK_POPOVER (priv->selection_bubble), &rect);
gtk_widget_show (priv->selection_bubble); gtk_widget_show (priv->selection_bubble);