diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-11-16 00:16:46 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-11-16 00:16:46 +0000 |
| commit | bc41c3ffcf8d4d13e0fccb107fd70e65ea9af1ef (patch) | |
| tree | 5fe84dd890ea9f14d4201bf1a992305a7f718db4 /gtk | |
| parent | ac5c0dbc986168216f79d309e15c020b3d39fedf (diff) | |
| download | gtk+-bc41c3ffcf8d4d13e0fccb107fd70e65ea9af1ef.tar.gz | |
remove unecessary rules for win32-specific config-substituted targets. If
Wed Nov 15 18:39:40 2000 Owen Taylor <otaylor@redhat.com>
* **/Makefile.am : remove unecessary rules for win32-specific
config-substituted targets. If you want these rules, use
--enable-maintainer-mode (called automatically by autogen.sh).
Stops a lot of unneccessary make-time warnings.
* gtk/gtktext{layout,display}.c: Factor in total width as
well as screen when figuring alignment for word-wrap as well as
no wrap; this is necessary to handle lines that cannot be wrapped
at all.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.am | 9 | ||||
| -rw-r--r-- | gtk/gtktextdisplay.c | 5 | ||||
| -rw-r--r-- | gtk/gtktextlayout.c | 9 |
3 files changed, 4 insertions, 19 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index bf67efe55c..262dd0a2e6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -607,15 +607,6 @@ testdnd_LDADD = $(LDADDS) simple_LDADD = $(LDADDS) #testthreads_LDADD = $(LDADDS) -makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.mingw.in - cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.msc.in - cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -gtk-win32.rc: $(top_builddir)/config.status $(top_srcdir)/gtk/gtk-win32.rc.in - cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status - .PHONY: files test test-debug files: diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c index 104a278ecf..be82c677e1 100644 --- a/gtk/gtktextdisplay.c +++ b/gtk/gtktextdisplay.c @@ -466,11 +466,6 @@ render_para (GdkDrawable *drawable, layout_logical.y += line_display->top_margin * PANGO_SCALE; screen_width = line_display->total_width; - if (screen_width < 0) - { - screen_width = pango_layout_get_width (layout); - screen_width = PANGO_PIXELS (screen_width); - } do { diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 01d76ddab3..68e2d0abbd 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -1132,14 +1132,14 @@ set_para_values (GtkTextLayout *layout, case GTK_WRAPMODE_CHAR: /* FIXME: Handle this; for now, fall-through */ case GTK_WRAPMODE_WORD: - display->total_width = -1; layout_width = layout->screen_width - display->left_margin - display->right_margin; pango_layout_set_width (display->layout, layout_width * PANGO_SCALE); break; case GTK_WRAPMODE_NONE: - display->total_width = MAX (layout->screen_width, layout->width) - display->left_margin - display->right_margin; break; } + + display->total_width = MAX (layout->screen_width, layout->width) - display->left_margin - display->right_margin; } static PangoAttribute * @@ -1790,10 +1790,9 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout, pango_layout_get_extents (display->layout, NULL, &extents); - if (display->total_width >= 0) - display->x_offset += (display->total_width - PANGO_PIXELS (extents.width)) * align; + display->x_offset += (display->total_width - PANGO_PIXELS (extents.x + extents.width)) * align; - display->width = PANGO_PIXELS (extents.width) + display->x_offset + display->right_margin; + display->width = PANGO_PIXELS (extents.width) + display->left_margin + display->right_margin; display->height += PANGO_PIXELS (extents.height); /* Free this if we aren't in a loop */ |