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

notebook: Make notebook scroll arrows honor initial gap setting

Browse Source 
So that they can be styled so they are not right on the edge.

https://bugzilla.gnome.org/show_bug.cgi?id=707920
This commit is contained in:
William Jon McCann 2013-08-06 10:35:38 +02:00
parent 8dd100d9b0
commit e07fec3e83
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtknotebook.c
View File

@ -2183,7 +2183,7 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook *notebook,
if (priv->scrollable) if (priv->scrollable)
tab_height = MIN (tab_height, tab_height = MIN (tab_height,
tab_max + (2 * scroll_arrow_vlength + arrow_spacing)); tab_max + (2 * scroll_arrow_vlength + arrow_spacing + initial_gap));
action_height += action_widget_requisition[ACTION_WIDGET_START].height; action_height += action_widget_requisition[ACTION_WIDGET_START].height;
action_height += action_widget_requisition[ACTION_WIDGET_END].height; action_height += action_widget_requisition[ACTION_WIDGET_END].height;
@ -2662,6 +2662,7 @@ gtk_notebook_get_arrow_rect (GtkNotebook *notebook,
GdkRectangle event_window_pos; GdkRectangle event_window_pos;
gboolean before = ARROW_IS_BEFORE (arrow); gboolean before = ARROW_IS_BEFORE (arrow);
gboolean left = ARROW_IS_LEFT (arrow); gboolean left = ARROW_IS_LEFT (arrow);
gint initial_gap;
if (gtk_notebook_get_event_window_position (notebook, &event_window_pos)) if (gtk_notebook_get_event_window_position (notebook, &event_window_pos))
{ {
@ -2671,6 +2672,7 @@ gtk_notebook_get_arrow_rect (GtkNotebook *notebook,
gtk_widget_style_get (GTK_WIDGET (notebook), gtk_widget_style_get (GTK_WIDGET (notebook),
"scroll-arrow-hlength", &scroll_arrow_hlength, "scroll-arrow-hlength", &scroll_arrow_hlength,
"scroll-arrow-vlength", &scroll_arrow_vlength, "scroll-arrow-vlength", &scroll_arrow_vlength,
"initial-gap", &initial_gap,
NULL); NULL);
switch (priv->tab_pos) switch (priv->tab_pos)
@ -2678,7 +2680,7 @@ gtk_notebook_get_arrow_rect (GtkNotebook *notebook,
case GTK_POS_LEFT: case GTK_POS_LEFT:
case GTK_POS_RIGHT: case GTK_POS_RIGHT:
rectangle->width = scroll_arrow_vlength; rectangle->width = scroll_arrow_vlength;
rectangle->height = scroll_arrow_vlength; rectangle->height = scroll_arrow_vlength + initial_gap;
if ((before && (priv->has_before_previous != priv->has_before_next)) || if ((before && (priv->has_before_previous != priv->has_before_next)) ||
(!before && (priv->has_after_previous != priv->has_after_next))) (!before && (priv->has_after_previous != priv->has_after_next)))
@ -2687,22 +2689,22 @@ gtk_notebook_get_arrow_rect (GtkNotebook *notebook,
rectangle->x = event_window_pos.x + event_window_pos.width / 2 - rectangle->width; rectangle->x = event_window_pos.x + event_window_pos.width / 2 - rectangle->width;
else else
rectangle->x = event_window_pos.x + event_window_pos.width / 2; rectangle->x = event_window_pos.x + event_window_pos.width / 2;
rectangle->y = event_window_pos.y; rectangle->y = event_window_pos.y + initial_gap;
if (!before) if (!before)
rectangle->y += event_window_pos.height - rectangle->height; rectangle->y += event_window_pos.height - rectangle->height - 2 * initial_gap;
break; break;
case GTK_POS_TOP: case GTK_POS_TOP:
case GTK_POS_BOTTOM: case GTK_POS_BOTTOM:
rectangle->width = scroll_arrow_hlength; rectangle->width = scroll_arrow_hlength + initial_gap;
rectangle->height = scroll_arrow_hlength; rectangle->height = scroll_arrow_hlength;
if (before) if (before)
{ {
if (left || !priv->has_before_previous) if (left || !priv->has_before_previous)
rectangle->x = event_window_pos.x; rectangle->x = event_window_pos.x + initial_gap;
else else
rectangle->x = event_window_pos.x + rectangle->width; rectangle->x = event_window_pos.x + initial_gap + rectangle->width;
} }
else else
{ {
@ -5566,7 +5568,7 @@ gtk_notebook_tab_space (GtkNotebook *notebook,
} }
*min += initial_gap; *min += initial_gap;
*max -= (2 * initial_gap); *max -= initial_gap;
if (!priv->scrollable) if (!priv->scrollable)
*show_arrows = FALSE; *show_arrows = FALSE;