From c990d4ab1a1598cb9b252159f5b3730c3f96e7a4 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 15 Nov 2000 19:50:45 +0000 Subject: [PATCH] If indent is negative, don't move the first line out into the margin, 2000-11-15 Havoc Pennington * gtk/gtktextlayout.c (set_para_values): If indent is negative, don't move the first line out into the margin, instead move the whole paragraph in order to make space for the first line within the margin --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktextlayout.c | 13 ------------- 8 files changed, 49 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5242787ca..2aa3385d21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-11-15 Havoc Pennington + + * gtk/gtktextlayout.c (set_para_values): If indent is negative, + don't move the first line out into the margin, instead move the + whole paragraph in order to make space for the first line within + the margin + 2000-11-15 Havoc Pennington * gtk/gtktextview.c (changed_handler): offset redraw rect by diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d5242787ca..2aa3385d21 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2000-11-15 Havoc Pennington + + * gtk/gtktextlayout.c (set_para_values): If indent is negative, + don't move the first line out into the margin, instead move the + whole paragraph in order to make space for the first line within + the margin + 2000-11-15 Havoc Pennington * gtk/gtktextview.c (changed_handler): offset redraw rect by diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d5242787ca..2aa3385d21 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2000-11-15 Havoc Pennington + + * gtk/gtktextlayout.c (set_para_values): If indent is negative, + don't move the first line out into the margin, instead move the + whole paragraph in order to make space for the first line within + the margin + 2000-11-15 Havoc Pennington * gtk/gtktextview.c (changed_handler): offset redraw rect by diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d5242787ca..2aa3385d21 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2000-11-15 Havoc Pennington + + * gtk/gtktextlayout.c (set_para_values): If indent is negative, + don't move the first line out into the margin, instead move the + whole paragraph in order to make space for the first line within + the margin + 2000-11-15 Havoc Pennington * gtk/gtktextview.c (changed_handler): offset redraw rect by diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d5242787ca..2aa3385d21 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2000-11-15 Havoc Pennington + + * gtk/gtktextlayout.c (set_para_values): If indent is negative, + don't move the first line out into the margin, instead move the + whole paragraph in order to make space for the first line within + the margin + 2000-11-15 Havoc Pennington * gtk/gtktextview.c (changed_handler): offset redraw rect by diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d5242787ca..2aa3385d21 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2000-11-15 Havoc Pennington + + * gtk/gtktextlayout.c (set_para_values): If indent is negative, + don't move the first line out into the margin, instead move the + whole paragraph in order to make space for the first line within + the margin + 2000-11-15 Havoc Pennington * gtk/gtktextview.c (changed_handler): offset redraw rect by diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d5242787ca..2aa3385d21 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2000-11-15 Havoc Pennington + + * gtk/gtktextlayout.c (set_para_values): If indent is negative, + don't move the first line out into the margin, instead move the + whole paragraph in order to make space for the first line within + the margin + 2000-11-15 Havoc Pennington * gtk/gtktextview.c (changed_handler): offset redraw rect by diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index fe5cbf31dc..f6c1e755e4 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -1117,21 +1117,8 @@ set_para_values (GtkTextLayout *layout, display->left_margin = style->left_margin; display->right_margin = style->right_margin; - if (style->indent < 0) - { - /* This means the margins can be negative. FIXME - * test that things work if they are. - */ - - if (pango_align == PANGO_ALIGN_LEFT) - display->left_margin += style->indent; - else if (pango_align == PANGO_ALIGN_RIGHT) - display->right_margin += style->indent; - } - display->x_offset = display->left_margin; - pango_layout_set_indent (display->layout, style->indent * PANGO_SCALE);