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

Fix entry drawing in the presence of margins

Browse Source 
Margins need to be taken into account when comparing requisitions
and allocations, which GtkEntry (and subclasses) do for some reason.
This commit is contained in:
Matthias Clasen 2011-08-09 15:08:53 +02:00
parent 17f99f663f
commit d324a99454
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkentry.c
View File

@ -3171,17 +3171,20 @@ gtk_entry_get_text_area_size (GtkEntry *entry,
GtkWidget *widget = GTK_WIDGET (entry); GtkWidget *widget = GTK_WIDGET (entry);
GtkAllocation allocation; GtkAllocation allocation;
GtkRequisition requisition; GtkRequisition requisition;
gint req_height;
gint frame_height; gint frame_height;
gint xborder, yborder; gint xborder, yborder;
gtk_widget_get_preferred_size (widget, &requisition, NULL); gtk_widget_get_preferred_size (widget, &requisition, NULL);
req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
_gtk_entry_get_borders (entry, &xborder, &yborder); _gtk_entry_get_borders (entry, &xborder, &yborder);
if (gtk_widget_get_realized (widget)) if (gtk_widget_get_realized (widget))
get_frame_size (entry, TRUE, NULL, NULL, NULL, &frame_height); get_frame_size (entry, TRUE, NULL, NULL, NULL, &frame_height);
else else
frame_height = requisition.height; frame_height = req_height;
if (gtk_widget_has_focus (widget) && !priv->interior_focus) if (gtk_widget_has_focus (widget) && !priv->interior_focus)
frame_height -= 2 * priv->focus_width; frame_height -= 2 * priv->focus_width;
@ -3190,13 +3193,13 @@ gtk_entry_get_text_area_size (GtkEntry *entry,
*x = xborder; *x = xborder;
if (y) if (y)
*y = frame_height / 2 - (requisition.height - yborder * 2) / 2; *y = frame_height / 2 - (req_height - yborder * 2) / 2;
if (width) if (width)
*width = allocation.width - xborder * 2; *width = allocation.width - xborder * 2;
if (height) if (height)
*height = requisition.height - yborder * 2; *height = req_height - yborder * 2;
} }
static void static void
@ -3229,8 +3232,12 @@ get_frame_size (GtkEntry *entry,
GtkAllocation allocation; GtkAllocation allocation;
GtkRequisition requisition; GtkRequisition requisition;
GtkWidget *widget = GTK_WIDGET (entry); GtkWidget *widget = GTK_WIDGET (entry);
gint req_height;
gtk_widget_get_preferred_size (widget, &requisition, NULL); gtk_widget_get_preferred_size (widget, &requisition, NULL);
req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
if (x) if (x)
@ -3241,7 +3248,7 @@ get_frame_size (GtkEntry *entry,
if (priv->is_cell_renderer) if (priv->is_cell_renderer)
*y = 0; *y = 0;
else else
*y = (allocation.height - requisition.height) / 2; *y = (allocation.height - req_height) / 2;
if (relative_to_window) if (relative_to_window)
*y += allocation.y; *y += allocation.y;
@ -3255,7 +3262,7 @@ get_frame_size (GtkEntry *entry,
if (priv->is_cell_renderer) if (priv->is_cell_renderer)
*height = allocation.height; *height = allocation.height;
else else
*height = requisition.height; *height = req_height;
} }
} }

34
gtk/gtkspinbutton.c
View File

@ -703,11 +703,13 @@ gtk_spin_button_realize (GtkWidget *widget)
gint attributes_mask; gint attributes_mask;
gboolean return_val; gboolean return_val;
gint arrow_size; gint arrow_size;
gint req_height;
GtkBorder padding; GtkBorder padding;
arrow_size = spin_button_get_arrow_size (spin_button); arrow_size = spin_button_get_arrow_size (spin_button);
gtk_widget_get_preferred_size (widget, &requisition, NULL); gtk_widget_get_preferred_size (widget, &requisition, NULL);
req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
gtk_widget_set_events (widget, gtk_widget_get_events (widget) | gtk_widget_set_events (widget, gtk_widget_get_events (widget) |
@ -729,9 +731,9 @@ gtk_spin_button_realize (GtkWidget *widget)
gtk_style_context_get_padding (context, state, &padding); gtk_style_context_get_padding (context, state, &padding);
attributes.x = allocation.x + allocation.width - arrow_size - (padding.left + padding.right); attributes.x = allocation.x + allocation.width - arrow_size - (padding.left + padding.right);
attributes.y = allocation.y + (allocation.height - requisition.height) / 2; attributes.y = allocation.y + (allocation.height - req_height) / 2;
attributes.width = arrow_size + padding.left + padding.right; attributes.width = arrow_size + padding.left + padding.right;
attributes.height = requisition.height; attributes.height = req_height;
priv->panel = gdk_window_new (gtk_widget_get_window (widget), priv->panel = gdk_window_new (gtk_widget_get_window (widget),
&attributes, attributes_mask); &attributes, attributes_mask);
@ -877,6 +879,7 @@ gtk_spin_button_size_allocate (GtkWidget *widget,
GtkBorder padding; GtkBorder padding;
gint arrow_size; gint arrow_size;
gint panel_width; gint panel_width;
gint req_height;
arrow_size = spin_button_get_arrow_size (spin); arrow_size = spin_button_get_arrow_size (spin);
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
@ -886,6 +889,7 @@ gtk_spin_button_size_allocate (GtkWidget *widget,
panel_width = arrow_size + padding.left + padding.right; panel_width = arrow_size + padding.left + padding.right;
gtk_widget_get_preferred_size (widget, &requisition, NULL); gtk_widget_get_preferred_size (widget, &requisition, NULL);
req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
gtk_widget_set_allocation (widget, allocation); gtk_widget_set_allocation (widget, allocation);
@ -895,10 +899,10 @@ gtk_spin_button_size_allocate (GtkWidget *widget,
panel_allocation.x = allocation->x + allocation->width - panel_width; panel_allocation.x = allocation->x + allocation->width - panel_width;
panel_allocation.width = panel_width; panel_allocation.width = panel_width;
panel_allocation.height = MIN (requisition.height, allocation->height); panel_allocation.height = MIN (req_height, allocation->height);
panel_allocation.y = allocation->y + panel_allocation.y = allocation->y +
(allocation->height - requisition.height) / 2; (allocation->height - req_height) / 2;
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->size_allocate (widget, allocation); GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->size_allocate (widget, allocation);
@ -1075,6 +1079,7 @@ gtk_spin_button_enter_notify (GtkWidget *widget,
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget); GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
GtkSpinButtonPrivate *priv = spin->priv; GtkSpinButtonPrivate *priv = spin->priv;
GtkRequisition requisition; GtkRequisition requisition;
gint req_height;
if (event->window == priv->panel) if (event->window == priv->panel)
{ {
@ -1086,8 +1091,9 @@ gtk_spin_button_enter_notify (GtkWidget *widget,
gdk_window_get_device_position (priv->panel, device, &x, &y, NULL); gdk_window_get_device_position (priv->panel, device, &x, &y, NULL);
gtk_widget_get_preferred_size (widget, &requisition, NULL); gtk_widget_get_preferred_size (widget, &requisition, NULL);
req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
if (y <= requisition.height / 2) if (y <= req_height / 2)
priv->in_child = GTK_ARROW_UP; priv->in_child = GTK_ARROW_UP;
else else
priv->in_child = GTK_ARROW_DOWN; priv->in_child = GTK_ARROW_DOWN;
@ -1260,6 +1266,7 @@ gtk_spin_button_button_press (GtkWidget *widget,
if (event->window == priv->panel) if (event->window == priv->panel)
{ {
GtkRequisition requisition; GtkRequisition requisition;
gint req_height;
if (!gtk_widget_has_focus (widget)) if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget); gtk_widget_grab_focus (widget);
@ -1269,8 +1276,9 @@ gtk_spin_button_button_press (GtkWidget *widget,
gtk_spin_button_update (spin); gtk_spin_button_update (spin);
gtk_widget_get_preferred_size (widget, &requisition, NULL); gtk_widget_get_preferred_size (widget, &requisition, NULL);
req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
if (event->y <= requisition.height / 2) if (event->y <= req_height / 2)
{ {
if (event->button == 1) if (event->button == 1)
start_spinning (spin, GTK_ARROW_UP, gtk_adjustment_get_step_increment (priv->adjustment)); start_spinning (spin, GTK_ARROW_UP, gtk_adjustment_get_step_increment (priv->adjustment));
@ -1315,22 +1323,24 @@ gtk_spin_button_button_release (GtkWidget *widget,
if (event->button == 3) if (event->button == 3)
{ {
GtkRequisition requisition; GtkRequisition requisition;
gint req_height;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state; GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
gtk_widget_get_preferred_size (widget, &requisition, NULL); gtk_widget_get_preferred_size (widget, &requisition, NULL);
req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); state = gtk_widget_get_state_flags (widget);
gtk_style_context_get_padding (context, state, &padding); gtk_style_context_get_padding (context, state, &padding);
if (event->y >= 0 && event->x >= 0 && if (event->y >= 0 && event->x >= 0 &&
event->y <= requisition.height && event->y <= req_height &&
event->x <= arrow_size + padding.left + padding.right) event->x <= arrow_size + padding.left + padding.right)
{ {
if (click_child == GTK_ARROW_UP && if (click_child == GTK_ARROW_UP &&
event->y <= requisition.height / 2) event->y <= req_height / 2)
{ {
gdouble diff; gdouble diff;
@ -1339,7 +1349,7 @@ gtk_spin_button_button_release (GtkWidget *widget,
gtk_spin_button_real_spin (spin, diff); gtk_spin_button_real_spin (spin, diff);
} }
else if (click_child == GTK_ARROW_DOWN && else if (click_child == GTK_ARROW_DOWN &&
event->y > requisition.height / 2) event->y > req_height / 2)
{ {
gdouble diff; gdouble diff;
@ -1370,19 +1380,21 @@ gtk_spin_button_motion_notify (GtkWidget *widget,
if (event->window == priv->panel) if (event->window == priv->panel)
{ {
GtkRequisition requisition; GtkRequisition requisition;
gint req_height;
gint y = event->y; gint y = event->y;
gdk_event_request_motions (event); gdk_event_request_motions (event);
gtk_widget_get_preferred_size (widget, &requisition, NULL); gtk_widget_get_preferred_size (widget, &requisition, NULL);
req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
if (y <= requisition.height / 2 && if (y <= req_height / 2 &&
priv->in_child == GTK_ARROW_DOWN) priv->in_child == GTK_ARROW_DOWN)
{ {
priv->in_child = GTK_ARROW_UP; priv->in_child = GTK_ARROW_UP;
gtk_widget_queue_draw (GTK_WIDGET (spin)); gtk_widget_queue_draw (GTK_WIDGET (spin));
} }
else if (y > requisition.height / 2 && else if (y > req_height / 2 &&
priv->in_child == GTK_ARROW_UP) priv->in_child == GTK_ARROW_UP)
{ {
priv->in_child = GTK_ARROW_DOWN; priv->in_child = GTK_ARROW_DOWN;