AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Redraw the character under the cursor when removing the cursor.

Browse Source 
Wed Dec 16 15:36:19 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):
	Redraw the character under the cursor when removing
	the cursor.
This commit is contained in:
Owen Taylor 1998-12-16 20:39:31 +00:00 committed by Owen Taylor
parent fcfe7370d8
commit c1726375b1
10 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Dec 16 15:36:19 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):
Redraw the character under the cursor when removing
the cursor.
Wed Dec 16 13:06:17 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.[ch] gtk/gtkmain.[ch] gtk/gtkprivate.h: Move main

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
Wed Dec 16 15:36:19 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):
Redraw the character under the cursor when removing
the cursor.
Wed Dec 16 13:06:17 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.[ch] gtk/gtkmain.[ch] gtk/gtkprivate.h: Move main

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Wed Dec 16 15:36:19 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):
Redraw the character under the cursor when removing
the cursor.
Wed Dec 16 13:06:17 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.[ch] gtk/gtkmain.[ch] gtk/gtkprivate.h: Move main

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Wed Dec 16 15:36:19 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):
Redraw the character under the cursor when removing
the cursor.
Wed Dec 16 13:06:17 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.[ch] gtk/gtkmain.[ch] gtk/gtkprivate.h: Move main

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Wed Dec 16 15:36:19 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):
Redraw the character under the cursor when removing
the cursor.
Wed Dec 16 13:06:17 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.[ch] gtk/gtkmain.[ch] gtk/gtkprivate.h: Move main

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Wed Dec 16 15:36:19 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):
Redraw the character under the cursor when removing
the cursor.
Wed Dec 16 13:06:17 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.[ch] gtk/gtkmain.[ch] gtk/gtkprivate.h: Move main

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Wed Dec 16 15:36:19 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):
Redraw the character under the cursor when removing
the cursor.
Wed Dec 16 13:06:17 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.[ch] gtk/gtkmain.[ch] gtk/gtkprivate.h: Move main

20
gtk/gtkentry.c
View File

@ -1439,15 +1439,29 @@ gtk_entry_draw_cursor_on_drawable (GtkEntry *entry, GdkDrawable *drawable)
(editable->selection_start_pos == editable->selection_end_pos))
{
gdk_draw_line (drawable, widget->style->fg_gc[GTK_STATE_NORMAL],
xoffset, 0, xoffset, text_area_height);
xoffset, INNER_BORDER,
xoffset, text_area_height - INNER_BORDER);
}
else
{
gint yoffset =
(text_area_height -
(widget->style->font->ascent + widget->style->font->descent)) / 2
+ widget->style->font->ascent;
gtk_paint_flat_box (widget->style, drawable,
GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
NULL, widget, "entry_bg",
xoffset, 0, 1, text_area_height);
}
xoffset, INNER_BORDER,
1, text_area_height - INNER_BORDER);
/* Draw the character under the cursor again */
gdk_draw_text_wc (drawable, widget->style->font,
widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
xoffset, yoffset,
entry->text + editable->current_pos, 1);
}
#ifdef USE_XIM
if (GTK_WIDGET_HAS_FOCUS(widget) && gdk_im_ready() && editable->ic &&

2
gtk/testgtkrc
View File

@ -17,7 +17,7 @@ pixmap_path "."
style "defaultfont"
{
fontset = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*"
# font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
}

2
tests/testgtkrc
View File

@ -17,7 +17,7 @@ pixmap_path "."
style "defaultfont"
{
fontset = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*"
# font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
}