callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unecessary rules for win32-specific config-substituted targets. If

Browse Source 
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.
This commit is contained in:
Owen Taylor
2000-11-16 00:16:46 +00:00
committed by Owen Taylor
parent ac5c0dbc98
commit bc41c3ffcf
15 changed files with 88 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
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.
2000-11-15 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Implement essential color cycling feature

12
ChangeLog.pre-2-0
View File

@ -1,3 +1,15 @@
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.
2000-11-15 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Implement essential color cycling feature

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
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.
2000-11-15 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Implement essential color cycling feature

12
ChangeLog.pre-2-2
View File

@ -1,3 +1,15 @@
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.
2000-11-15 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Implement essential color cycling feature

12
ChangeLog.pre-2-4
View File

@ -1,3 +1,15 @@
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.
2000-11-15 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Implement essential color cycling feature

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
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.
2000-11-15 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Implement essential color cycling feature

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
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.
2000-11-15 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Implement essential color cycling feature

3
gdk-pixbuf/Makefile.am
View File

@ -199,6 +199,3 @@ EXTRA_DIST = \
pixbufloader_png.def \
pixbufloader_tiff.def \
pixbufloader_wbmp.def
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk-pixbuf/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=gdk-pixbuf/$@ CONFIG_HEADERS= $(SHELL) ./config.status

4
gdk-pixbuf/pixops/Makefile.am
View File

@ -25,7 +25,3 @@ EXTRA_DIST = \
DETAILS \
makefile.mingw \
makefile.mingw.in
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk-pixbuf/pixops/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=gdk-pixbuf/pixops/$@ CONFIG_HEADERS= $(SHELL) ./config.status

3
gdk/Makefile.am
View File

@ -180,9 +180,6 @@ stamp-gc-h: ../config.status
cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
echo timestamp > stamp-gc-h
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=gdk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
.PHONY: files
files:

4
gdk/win32/Makefile.am
View File

@ -26,7 +26,3 @@ EXTRA_DIST = \
gdkwin32id.c \
gdkwindow-win32.c \
surrogate-dimm.h
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk/win32/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=gdk/win32/$@ CONFIG_HEADERS= $(SHELL) ./config.status

3
gdk/win32/rc/Makefile.am
View File

@ -79,6 +79,3 @@ EXTRA_DIST = \
cursor94.cur \
cursor96.cur \
cursor98.cur
gdk.rc: $(top_builddir)/config.status $(top_srcdir)/gdk/win32/rc/gdk.rc.in
cd $(top_builddir) && CONFIG_FILES=gdk/win32/rc/$@ CONFIG_HEADERS= $(SHELL) ./config.status

9
gtk/Makefile.am
View File

@ -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:

5
gtk/gtktextdisplay.c
View File

@ -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
{

9
gtk/gtktextlayout.c
View File

@ -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 */