Take border width into account.

Sun Feb 24 14:15:45 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtktextview.c (widget_to_buffer): Take border
        width into account.

        * gtk/gtklabel.c (get_label_wrap_width): Don't use GdkFont
        to compute wrap width ... GdkFont will pull in X11 core
        fonts.
This commit is contained in:
Owen Taylor
2002-02-24 19:56:14 +00:00
committed by Owen Taylor
parent a93987de00
commit 60c1630edc
9 changed files with 116 additions and 6 deletions

View File

@ -6848,6 +6848,7 @@ widget_to_buffer (GtkTextView *text_view,
gint focus_edge_width;
gboolean interior_focus;
gint focus_width;
gint border_width = GTK_CONTAINER (text_view)->border_width;
gtk_widget_style_get (GTK_WIDGET (text_view),
"interior_focus", &interior_focus,
@ -6861,14 +6862,14 @@ widget_to_buffer (GtkTextView *text_view,
if (buffer_x)
{
*buffer_x = widget_x - focus_edge_width + text_view->xoffset;
*buffer_x = widget_x - focus_edge_width - border_width + text_view->xoffset;
if (text_view->left_window)
*buffer_x -= text_view->left_window->allocation.width;
}
if (buffer_y)
{
*buffer_y = widget_y - focus_edge_width + text_view->yoffset;
*buffer_y = widget_y - focus_edge_width - border_width + text_view->yoffset;
if (text_view->top_window)
*buffer_y -= text_view->top_window->allocation.height;
}