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

gtkentry: Pass the correct set of state flags to gtk_style_context_get*

Browse Source 
This eliminates a lot of overhead in the CSS engine recalculating
cached CSS rules, and is overall the correct thing to do.
This commit is contained in:
Jasper St. Pierre 2014-11-24 17:07:01 -08:00
parent 0c09d44509
commit 442fd63ea6
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtkentry.c
View File

@ -2834,13 +2834,15 @@ get_icon_width (GtkEntry *entry,
GtkStyleContext *context; GtkStyleContext *context;
GtkBorder padding; GtkBorder padding;
gint width; gint width;
GtkStateFlags state;
if (!icon_info) if (!icon_info)
return 0; return 0;
context = gtk_widget_get_style_context (GTK_WIDGET (entry)); context = gtk_widget_get_style_context (GTK_WIDGET (entry));
state = gtk_style_context_get_state (context);
gtk_entry_prepare_context_for_icon (entry, context, icon_pos); gtk_entry_prepare_context_for_icon (entry, context, icon_pos);
gtk_style_context_get_padding (context, 0, &padding); gtk_style_context_get_padding (context, state, &padding);
_gtk_icon_helper_get_size (icon_info->icon_helper, context, _gtk_icon_helper_get_size (icon_info->icon_helper, context,
&width, NULL); &width, NULL);
@ -3406,19 +3408,17 @@ _gtk_entry_get_borders (GtkEntry *entry,
GtkWidget *widget = GTK_WIDGET (entry); GtkWidget *widget = GTK_WIDGET (entry);
GtkBorder padding, border; GtkBorder padding, border;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_style_context_get_state (context);
gtk_style_context_get_padding (context, state, &padding);
gtk_style_context_get_border (context, state, &border);
gtk_style_context_get_padding (context, 0, &padding); border_out->top = padding.top + border.top;
gtk_style_context_get_border (context, 0, &border); border_out->bottom = padding.bottom + border.bottom;
border_out->left = padding.left + border.left;
if (border_out != NULL) border_out->right = padding.right + border.right;
{
border_out->top = padding.top + border.top;
border_out->bottom = padding.bottom + border.bottom;
border_out->left = padding.left + border.left;
border_out->right = padding.right + border.right;
}
} }
static void static void
@ -3770,6 +3770,7 @@ draw_icon (GtkWidget *widget,
gint x, y, width, height, pix_width, pix_height; gint x, y, width, height, pix_width, pix_height;
GtkStyleContext *context; GtkStyleContext *context;
GtkBorder padding; GtkBorder padding;
GtkStateFlags state;
if (!icon_info) if (!icon_info)
return; return;
@ -3789,7 +3790,8 @@ draw_icon (GtkWidget *widget,
gtk_entry_prepare_context_for_icon (entry, context, icon_pos); gtk_entry_prepare_context_for_icon (entry, context, icon_pos);
_gtk_icon_helper_get_size (icon_info->icon_helper, context, _gtk_icon_helper_get_size (icon_info->icon_helper, context,
&pix_width, &pix_height); &pix_width, &pix_height);
gtk_style_context_get_padding (context, 0, &padding); state = gtk_style_context_get_state (context);
gtk_style_context_get_padding (context, state, &padding);
x = MAX (0, padding.left); x = MAX (0, padding.left);
y = MAX (0, (height - pix_height) / 2); y = MAX (0, (height - pix_height) / 2);
@ -3866,6 +3868,7 @@ get_progress_area (GtkWidget *widget,
GtkStyleContext *context; GtkStyleContext *context;
GtkBorder margin, border, entry_borders; GtkBorder margin, border, entry_borders;
gint frame_width, text_area_width, text_area_height; gint frame_width, text_area_width, text_area_height;
GtkStateFlags state;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
_gtk_entry_get_borders (entry, &entry_borders); _gtk_entry_get_borders (entry, &entry_borders);
@ -3881,13 +3884,15 @@ get_progress_area (GtkWidget *widget,
*width = text_area_width + entry_borders.left + entry_borders.right; *width = text_area_width + entry_borders.left + entry_borders.right;
*height = text_area_height + entry_borders.top + entry_borders.bottom; *height = text_area_height + entry_borders.top + entry_borders.bottom;
state = gtk_style_context_get_state (context);
/* if the text area got resized by a subclass, subtract the left/right /* if the text area got resized by a subclass, subtract the left/right
* border width, so that the progress bar won't extend over the resized * border width, so that the progress bar won't extend over the resized
* text area. * text area.
*/ */
if (frame_width > *width) if (frame_width > *width)
{ {
gtk_style_context_get_border (context, 0, &border); gtk_style_context_get_border (context, state, &border);
if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL) if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL)
{ {
*x = (frame_width - *width) + border.left; *x = (frame_width - *width) + border.left;
@ -3900,7 +3905,7 @@ get_progress_area (GtkWidget *widget,
} }
gtk_entry_prepare_context_for_progress (entry, context); gtk_entry_prepare_context_for_progress (entry, context);
gtk_style_context_get_margin (context, 0, &margin); gtk_style_context_get_margin (context, state, &margin);
gtk_style_context_restore (context); gtk_style_context_restore (context);
@ -9932,9 +9937,11 @@ gtk_entry_drag_motion (GtkWidget *widget,
gint new_position, old_position; gint new_position, old_position;
gint sel1, sel2; gint sel1, sel2;
GtkBorder padding; GtkBorder padding;
GtkStateFlags state;
style_context = gtk_widget_get_style_context (widget); style_context = gtk_widget_get_style_context (widget);
gtk_style_context_get_padding (style_context, 0, &padding); state = gtk_style_context_get_state (style_context);
gtk_style_context_get_padding (style_context, state, &padding);
x -= padding.left; x -= padding.left;
y -= padding.top; y -= padding.top;
@ -10007,11 +10014,13 @@ gtk_entry_drag_data_received (GtkWidget *widget,
GtkStyleContext *style_context; GtkStyleContext *style_context;
GtkBorder padding; GtkBorder padding;
gchar *str; gchar *str;
GtkStateFlags state;
str = (gchar *) gtk_selection_data_get_text (selection_data); str = (gchar *) gtk_selection_data_get_text (selection_data);
style_context = gtk_widget_get_style_context (widget); style_context = gtk_widget_get_style_context (widget);
gtk_style_context_get_padding (style_context, 0, &padding); state = gtk_style_context_get_state (style_context);
gtk_style_context_get_padding (style_context, state, &padding);
x -= padding.left; x -= padding.left;
y -= padding.top; y -= padding.top;