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

Work when the entry is not realized. (#392315, Yevgen Muntyan)

Browse Source 
2007-01-03  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkentry.c (get_text_area_size): Work when the
        entry is not realized.  (#392315, Yevgen Muntyan)

        * gtk/gtkentry.c (gtk_entry_queue_draw): Use
        GTK_WIDGET_DRAWABLE() here.  (#392227, Chris Wilson)

        * gtk/gtkentry.c (cursor_blinks): Don't get settings
        unnecessarily.  (#392227)


svn path=/trunk/; revision=17030
This commit is contained in:
Matthias Clasen
2007-01-03 16:10:15 +00:00
committed by Matthias Clasen
parent 8805b9832a
commit 014b276774
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2007-01-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c (get_text_area_size): Work when the
entry is not realized. (#392315, Yevgen Muntyan)
* gtk/gtkentry.c (gtk_entry_queue_draw): Use
GTK_WIDGET_DRAWABLE() here. (#392227, Chris Wilson)
* gtk/gtkentry.c (cursor_blinks): Don't get settings
unnecessarily. (#392227)
2007-01-02 Matthias Clasen <mclasen@redhat.com> 2007-01-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Only process * gtk/gtkwindow.c (gtk_window_move_resize): Only process

22
gtk/gtkentry.c
View File

@ -1389,14 +1389,16 @@ get_text_area_size (GtkEntry *entry,
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
NULL); NULL);
gtk_widget_get_child_requisition (widget, &requisition);
_gtk_entry_get_borders (entry, &xborder, &yborder);
if (GTK_WIDGET_REALIZED (widget))
gdk_drawable_get_size (widget->window, NULL, &frame_height); gdk_drawable_get_size (widget->window, NULL, &frame_height);
else
frame_height = requisition.height;
if (GTK_WIDGET_HAS_FOCUS (widget) && !interior_focus) if (GTK_WIDGET_HAS_FOCUS (widget) && !interior_focus)
height -= 2 * focus_width; frame_height -= 2 * focus_width;
gtk_widget_get_child_requisition (widget, &requisition);
_gtk_entry_get_borders (entry, &xborder, &yborder);
if (x) if (x)
*x = xborder; *x = xborder;
@ -3620,7 +3622,7 @@ gtk_entry_draw_cursor (GtkEntry *entry,
static void static void
gtk_entry_queue_draw (GtkEntry *entry) gtk_entry_queue_draw (GtkEntry *entry)
{ {
if (GTK_WIDGET_REALIZED (entry)) if (GTK_WIDGET_DRAWABLE (entry))
gdk_window_invalidate_rect (entry->text_area, NULL, FALSE); gdk_window_invalidate_rect (entry->text_area, NULL, FALSE);
} }
@ -5338,14 +5340,16 @@ gtk_entry_drag_data_delete (GtkWidget *widget,
static gboolean static gboolean
cursor_blinks (GtkEntry *entry) cursor_blinks (GtkEntry *entry)
{ {
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (entry));
gboolean blink;
if (GTK_WIDGET_HAS_FOCUS (entry) && if (GTK_WIDGET_HAS_FOCUS (entry) &&
entry->editable && entry->editable &&
entry->selection_bound == entry->current_pos) entry->selection_bound == entry->current_pos)
{ {
GtkSettings *settings;
gboolean blink;
settings = gtk_widget_get_settings (GTK_WIDGET (entry));
g_object_get (settings, "gtk-cursor-blink", &blink, NULL); g_object_get (settings, "gtk-cursor-blink", &blink, NULL);
return blink; return blink;
} }
else else