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

menu: Respect borders properly for scroll arrows

Browse Source
This commit is contained in:
Benjamin Otte 2014-10-11 02:40:48 +02:00
parent 7b58ca4623
commit f4e44e9e6e
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkmenu.c
View File

@ -2991,44 +2991,46 @@ get_arrows_visible_area (GtkMenu *menu,
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
border->x = border_width + menu_padding.left;
border->y = border_width + menu_padding.top;
border->width = gdk_window_get_width (gtk_widget_get_window (widget));
border->height = gdk_window_get_height (gtk_widget_get_window (widget));
border->width = gdk_window_get_width (gtk_widget_get_window (widget))
- 2 * border_width - menu_padding.left - menu_padding.right;
border->height = gdk_window_get_height (gtk_widget_get_window (widget))
- 2 * border_width - menu_padding.top - menu_padding.bottom;
switch (arrow_placement)
{
case GTK_ARROWS_BOTH:
upper->x = border->x;
upper->y = border->y;
upper->width = border->width - 2 * border->x;
upper->width = border->width;
upper->height = scroll_arrow_height;
lower->x = border->x;
lower->y = border->height - border->y - scroll_arrow_height;
lower->width = border->width - 2 * border->x;
lower->width = border->width;
lower->height = scroll_arrow_height;
break;
case GTK_ARROWS_START:
upper->x = border->x;
upper->y = border->y;
upper->width = (border->width - 2 * border->x) / 2;
upper->width = border->width / 2;
upper->height = scroll_arrow_height;
lower->x = border->x + upper->width;
lower->y = border->y;
lower->width = (border->width - 2 * border->x) / 2;
lower->width = border->width - upper->width;
lower->height = scroll_arrow_height;
break;
case GTK_ARROWS_END:
upper->x = border->x;
upper->y = border->height - border->y - scroll_arrow_height;
upper->width = (border->width - 2 * border->x) / 2;
upper->y = border->height - scroll_arrow_height;
upper->width = border->width / 2;
upper->height = scroll_arrow_height;
lower->x = border->x + upper->width;
lower->y = border->height - border->y - scroll_arrow_height;
lower->width = (border->width - 2 * border->x) / 2;
lower->y = border->height - scroll_arrow_height;
lower->width = border->width - upper->width;
lower->height = scroll_arrow_height;
break;
@ -3038,7 +3040,7 @@ get_arrows_visible_area (GtkMenu *menu,
lower->x = lower->y = lower->width = lower->height = 0;
}
*arrow_space = scroll_arrow_height - menu_padding.top - menu_padding.bottom;
*arrow_space = scroll_arrow_height;
}
static gboolean