From db4895fbe52c63fdcee60a35c64a7afbb353e243 Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Wed, 1 Mar 2017 20:10:55 +0000 Subject: [PATCH] TextLayout: Clarify implementation of special case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This exists to exit early for invisible lines. It attempts to use the LineDisplay’s direction to create a corresponding PangoLayout. However, the dir is not yet set by this point, & the display was new0()d, so its dir is always 0 == TEXT_DIR_NONE. Thus, we always create an LTR layout. Whatever the original intent, this outcome seems to be OK, so let’s make the code say what it means, rather than using a misleading conditional. https://bugzilla.gnome.org/show_bug.cgi?id=779099 --- gtk/gtktextlayout.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 1d96d5f7d8..51ac51a3b6 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -2299,11 +2299,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout, */ if (totally_invisible_line (layout, line, &iter)) { - if (display->direction == GTK_TEXT_DIR_RTL) - display->layout = pango_layout_new (layout->rtl_context); - else - display->layout = pango_layout_new (layout->ltr_context); - + display->layout = pango_layout_new (layout->ltr_context); return display; }