Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't display wrap indicators when text is not editable and word wrap is

Browse Source 
Wed Jul 21 15:47:39 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktext.c: Don't display wrap indicators when
	text is not editable and word wrap is on.
This commit is contained in:
Owen Taylor
1999-07-21 19:45:55 +00:00
committed by Owen Taylor
parent bd7c5b22be
commit 66a7a593e2
8 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
Wed Jul 21 15:47:39 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c: Don't display wrap indicators when
text is not editable and word wrap is on.
Wed Jul 21 08:21:40 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): special case

5
ChangeLog.pre-2-0
View File

@@ -1,3 +1,8 @@
Wed Jul 21 15:47:39 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c: Don't display wrap indicators when
text is not editable and word wrap is on.
Wed Jul 21 08:21:40 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): special case

5
ChangeLog.pre-2-10
View File

@@ -1,3 +1,8 @@
Wed Jul 21 15:47:39 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c: Don't display wrap indicators when
text is not editable and word wrap is on.
Wed Jul 21 08:21:40 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): special case

5
ChangeLog.pre-2-2
View File

@@ -1,3 +1,8 @@
Wed Jul 21 15:47:39 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c: Don't display wrap indicators when
text is not editable and word wrap is on.
Wed Jul 21 08:21:40 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): special case

5
ChangeLog.pre-2-4
View File

@@ -1,3 +1,8 @@
Wed Jul 21 15:47:39 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c: Don't display wrap indicators when
text is not editable and word wrap is on.
Wed Jul 21 08:21:40 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): special case

5
ChangeLog.pre-2-6
View File

@@ -1,3 +1,8 @@
Wed Jul 21 15:47:39 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c: Don't display wrap indicators when
text is not editable and word wrap is on.
Wed Jul 21 08:21:40 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): special case

5
ChangeLog.pre-2-8
View File

@@ -1,3 +1,8 @@
Wed Jul 21 15:47:39 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c: Don't display wrap indicators when
text is not editable and word wrap is on.
Wed Jul 21 08:21:40 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): special case

22
gtk/gtktext.c
View File

@@ -792,13 +792,14 @@ gtk_text_real_set_editable (GtkEditable *editable,
g_return_if_fail (GTK_IS_TEXT (editable));
text = GTK_TEXT (editable);
editable->editable = (is_editable != FALSE);
if (is_editable)
draw_cursor (text, TRUE);
else
undraw_cursor (text, TRUE);
if (GTK_WIDGET_REALIZED (text))
{
recompute_geometry (text);
gtk_widget_queue_draw (GTK_WIDGET (text));
}
}
void
@@ -4674,7 +4675,8 @@ find_line_params (GtkText* text,
GdkFont *font;
gdk_window_get_size (text->text_area, (gint*) &max_display_pixels, NULL);
max_display_pixels -= LINE_WRAP_ROOM;
if (GTK_EDITABLE (text)->editable || !text->word_wrap)
max_display_pixels -= LINE_WRAP_ROOM;
lp.wraps = 0;
lp.tab_cont = *tab_cont;
@@ -5064,7 +5066,10 @@ draw_line (GtkText* text,
len = 1;
gdk_window_get_size (text->text_area, &pixels_remaining, NULL);
pixels_remaining -= (LINE_WRAP_ROOM + running_offset);
if (GTK_EDITABLE (text)->editable || !text->word_wrap)
pixels_remaining -= (LINE_WRAP_ROOM + running_offset);
else
pixels_remaining -= running_offset;
space_width = MARK_CURRENT_TEXT_FONT(text, &mark)->char_widths[' '];
@@ -5096,6 +5101,9 @@ draw_line_wrap (GtkText* text, guint height /* baseline height */)
GdkPixmap *bitmap;
gint bitmap_width;
gint bitmap_height;
if (!GTK_EDITABLE (text)->editable && text->word_wrap)
return;
if (text->line_wrap)
{