AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 06:10:15 +00:00
Code Issues Projects Releases Wiki Activity

bubblewindow: check the border-radius when rendering the bubble tail.

Browse Source
This commit is contained in:
Carlos Garnacho 2013-11-12 12:41:24 +01:00
parent d55f39d26d
commit 617f23b7eb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkbubblewindow.c
View File

@ -256,10 +256,16 @@ gtk_bubble_window_get_gap_coords (GtkBubbleWindow *window,
gint final_x, final_y; gint final_x, final_y;
GtkPositionType gap_side; GtkPositionType gap_side;
GtkAllocation allocation; GtkAllocation allocation;
gint border_radius;
gtk_bubble_window_get_pointed_to_coords (window, &x, &y, NULL); gtk_bubble_window_get_pointed_to_coords (window, &x, &y, NULL);
gtk_widget_get_allocation (GTK_WIDGET (window), &allocation); gtk_widget_get_allocation (GTK_WIDGET (window), &allocation);
gtk_style_context_get (gtk_widget_get_style_context (GTK_WIDGET (window)),
gtk_widget_get_state_flags (GTK_WIDGET (window)),
GTK_STYLE_PROPERTY_BORDER_RADIUS, &border_radius,
NULL);
base = tip = 0; base = tip = 0;
gap_side = GTK_POS_LEFT; gap_side = GTK_POS_LEFT;
@ -287,28 +293,28 @@ gtk_bubble_window_get_gap_coords (GtkBubbleWindow *window,
if (POS_IS_VERTICAL (priv->final_position)) if (POS_IS_VERTICAL (priv->final_position))
{ {
initial_x = CLAMP (x - priv->win_x - TAIL_GAP_WIDTH / 2, initial_x = CLAMP (x - priv->win_x - TAIL_GAP_WIDTH / 2,
0, allocation.width - TAIL_GAP_WIDTH); border_radius, allocation.width - TAIL_GAP_WIDTH);
initial_y = base; initial_y = base;
tip_x = CLAMP (x - priv->win_x, 0, allocation.width); tip_x = CLAMP (x - priv->win_x, 0, allocation.width);
tip_y = tip; tip_y = tip;
final_x = CLAMP (x - priv->win_x + TAIL_GAP_WIDTH / 2, final_x = CLAMP (x - priv->win_x + TAIL_GAP_WIDTH / 2,
TAIL_GAP_WIDTH, allocation.width); TAIL_GAP_WIDTH, allocation.width - border_radius);
final_y = base; final_y = base;
} }
else else
{ {
initial_x = base; initial_x = base;
initial_y = CLAMP (y - priv->win_y - TAIL_GAP_WIDTH / 2, initial_y = CLAMP (y - priv->win_y - TAIL_GAP_WIDTH / 2,
0, allocation.height - TAIL_GAP_WIDTH); border_radius, allocation.height - TAIL_GAP_WIDTH);
tip_x = tip; tip_x = tip;
tip_y = CLAMP (y - priv->win_y, 0, allocation.height); tip_y = CLAMP (y - priv->win_y, 0, allocation.height);
final_x = base; final_x = base;
final_y = CLAMP (y - priv->win_y + TAIL_GAP_WIDTH / 2, final_y = CLAMP (y - priv->win_y + TAIL_GAP_WIDTH / 2,
TAIL_GAP_WIDTH, allocation.height); TAIL_GAP_WIDTH, allocation.height - border_radius);
} }
if (initial_x_out) if (initial_x_out)