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

entry: Remove needless check

Browse Source 
The only window we're ever called to draw is our own window. D'oh.
This commit is contained in:
Benjamin Otte 2011-04-19 00:56:16 +02:00
parent 10fd53970c
commit c70698084c
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gtk/gtkentry.c
View File

@ -3554,44 +3554,41 @@ gtk_entry_draw (GtkWidget *widget,
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_set_state (context, state); gtk_style_context_set_state (context, state);
if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget))) /* Draw entry_bg, shadow, progress and focus */
gtk_entry_draw_frame (widget, context, cr);
/* Draw text and cursor */
cairo_save (cr);
gtk_cairo_transform_to_window (cr, widget, priv->text_area);
if (priv->dnd_position != -1)
gtk_entry_draw_cursor (GTK_ENTRY (widget), cr, CURSOR_DND);
gtk_entry_draw_text (GTK_ENTRY (widget), cr);
/* When no text is being displayed at all, don't show the cursor */
if (gtk_entry_get_display_mode (entry) != DISPLAY_BLANK &&
gtk_widget_has_focus (widget) &&
priv->selection_bound == priv->current_pos && priv->cursor_visible)
gtk_entry_draw_cursor (GTK_ENTRY (widget), cr, CURSOR_STANDARD);
cairo_restore (cr);
/* Draw icons */
for (i = 0; i < MAX_ICONS; i++)
{ {
/* Draw entry_bg, shadow, progress and focus */ EntryIconInfo *icon_info = priv->icons[i];
gtk_entry_draw_frame (widget, context, cr);
/* Draw text and cursor */ if (icon_info != NULL)
cairo_save (cr);
gtk_cairo_transform_to_window (cr, widget, priv->text_area);
if (priv->dnd_position != -1)
gtk_entry_draw_cursor (GTK_ENTRY (widget), cr, CURSOR_DND);
gtk_entry_draw_text (GTK_ENTRY (widget), cr);
/* When no text is being displayed at all, don't show the cursor */
if (gtk_entry_get_display_mode (entry) != DISPLAY_BLANK &&
gtk_widget_has_focus (widget) &&
priv->selection_bound == priv->current_pos && priv->cursor_visible)
gtk_entry_draw_cursor (GTK_ENTRY (widget), cr, CURSOR_STANDARD);
cairo_restore (cr);
/* Draw icons */
for (i = 0; i < MAX_ICONS; i++)
{ {
EntryIconInfo *icon_info = priv->icons[i]; cairo_save (cr);
if (icon_info != NULL) gtk_cairo_transform_to_window (cr, widget, icon_info->window);
{
cairo_save (cr);
gtk_cairo_transform_to_window (cr, widget, icon_info->window); draw_icon (widget, cr, i);
draw_icon (widget, cr, i); cairo_restore (cr);
cairo_restore (cr);
}
} }
} }