AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 04:31:09 +00:00
Code Issues Projects Releases Wiki Activity

flowbox: don't use focus padding

Browse Source
This commit is contained in:
Cosimo Cecchi 2014-05-02 02:05:49 +02:00
parent 241b4c0c75
commit 053b21cc1f
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkflowbox.c
View File

@ -342,7 +342,6 @@ gtk_flow_box_child_draw (GtkWidget *widget,
GtkStyleContext* context; GtkStyleContext* context;
GtkStateFlags state; GtkStateFlags state;
GtkBorder border; GtkBorder border;
gint focus_pad;
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
@ -354,13 +353,9 @@ gtk_flow_box_child_draw (GtkWidget *widget,
if (gtk_widget_has_visible_focus (widget)) if (gtk_widget_has_visible_focus (widget))
{ {
gtk_style_context_get_border (context, state, &border); gtk_style_context_get_border (context, state, &border);
gtk_render_focus (context, cr, border.left, border.top,
gtk_style_context_get_style (context, allocation.width - border.left - border.right,
"focus-padding", &focus_pad, allocation.height - border.top - border.bottom);
NULL);
gtk_render_focus (context, cr, border.left + focus_pad, border.top + focus_pad,
allocation.width - 2 * focus_pad - border.left - border.right,
allocation.height - 2 * focus_pad - border.top - border.bottom);
} }
GTK_WIDGET_CLASS (gtk_flow_box_child_parent_class)->draw (widget, cr); GTK_WIDGET_CLASS (gtk_flow_box_child_parent_class)->draw (widget, cr);
@ -378,7 +373,7 @@ gtk_flow_box_child_get_full_border (GtkFlowBoxChild *child,
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state; GtkStateFlags state;
GtkBorder padding, border; GtkBorder padding, border;
int focus_width, focus_pad; int focus_width;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_style_context_get_state (context); state = gtk_style_context_get_state (context);
@ -387,13 +382,12 @@ gtk_flow_box_child_get_full_border (GtkFlowBoxChild *child,
gtk_style_context_get_border (context, state, &border); gtk_style_context_get_border (context, state, &border);
gtk_style_context_get_style (context, gtk_style_context_get_style (context,
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
"focus-padding", &focus_pad,
NULL); NULL);
full_border->left = padding.left + border.left + focus_width + focus_pad; full_border->left = padding.left + border.left + focus_width;
full_border->right = padding.right + border.right + focus_width + focus_pad; full_border->right = padding.right + border.right + focus_width;
full_border->top = padding.top + border.top + focus_width + focus_pad; full_border->top = padding.top + border.top + focus_width;
full_border->bottom = padding.bottom + border.bottom + focus_width + focus_pad; full_border->bottom = padding.bottom + border.bottom + focus_width;
} }
static GtkSizeRequestMode static GtkSizeRequestMode