diff options
author | Havoc Pennington <hp@redhat.com> | 2000-11-13 18:49:52 +0000 |
---|---|---|
committer | Havoc Pennington <hp@src.gnome.org> | 2000-11-13 18:49:52 +0000 |
commit | 15e0004b109b85f15556b2d09d0d703c9c0534f7 (patch) | |
tree | 5747ab72346376c1500efa71aedb0156efc1cbd0 /gtk/gtktextlayout.h | |
parent | be698675c7c043e3161362b99b9dc656531c91b4 (diff) | |
download | gtk+-15e0004b109b85f15556b2d09d0d703c9c0534f7.tar.gz |
Free the filename of the module file.
2000-11-13 Havoc Pennington <hp@redhat.com>
* gtk/gtkimmodule.c (gtk_im_module_init): Free the filename of
the module file.
* gtk/gtktexttag.c (gtk_text_attributes_copy): fix memory leak of
dest->language
* gtk/testtext.c: Test pixels above/below/inside paragraphs
settings
* gtk/gtktextview.c: Implement object args and setters/getters for
all the aspects of the GtkTextAttributes that are not set from
GtkWidget attributes. This is spacing, justification, margins,
etc.
(gtk_text_view_set_arg)
(gtk_text_view_get_arg): implement get/set for editable, wrap mode
args
(gtk_text_view_class_init): Add args for justify, left_margin,
right_margin, indent, and tabs
* gtk/gtktextlayout.c (set_para_values): fix to display indent
attribute properly
* gtk/gtktexttag.c: Remove left_wrapped_line_margin attribute,
replace with indent attribute
* gtk/gtktextlayout.c (set_para_values): multiply indent by
PANGO_SCALE
* gtk/gtktextdisplay.c (render_para): Use PangoLayoutIter,
rearranging code to do that
(gtk_text_layout_draw): Pass in the y for the whole LineDisplay,
i.e. don't subtract the top_margin first, just to keep
all margin-futzing in one place.
* gdk/gdkpango.c (gdk_draw_layout): Use PangoLayoutIter
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_location): Remove
special case of last line, Pango now handles this itself.
(gtk_text_layout_get_iter_at_pixel): Fix incorrect clamp of the
Y coordinate
(gtk_text_layout_move_iter_to_x): port to use PangoLayoutIter
(find_display_line_above): wasn't moving the byte index as it
iterated over lines, so always returned byte 0. Also, port to use
PangoLayoutIter.
(find_display_line_below): same problem as
find_display_line_above. Also, port to use PangoLayoutIter.
Diffstat (limited to 'gtk/gtktextlayout.h')
-rw-r--r-- | gtk/gtktextlayout.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h index dca8e362e5..a24c6f7818 100644 --- a/gtk/gtktextlayout.h +++ b/gtk/gtktextlayout.h @@ -223,7 +223,10 @@ struct _GtkTextLineDisplay gint width; /* Width of layout */ gint total_width; /* width - margins, if no width set on layout, if width set on layout, -1 */ gint height; - gint x_offset; /* Amount layout is shifted from left edge */ + /* Amount layout is shifted from left edge - this is the left margin + * plus any other factors, such as alignment or indentation. + */ + gint x_offset; gint left_margin; gint right_margin; gint top_margin; |