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

GtkMenuButton: improve rtl support

Browse Source 
Show the menu at the side the arrow points to,
also in rtl locales.
https://bugzilla.gnome.org/show_bug.cgi?id=684606
This commit is contained in:
Matthias Clasen 2012-09-21 23:53:11 -04:00
parent 72d8deb606
commit d03ceb8b2c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkmenubutton.c
View File

@ -336,12 +336,14 @@ menu_position_side_func (GtkMenu *menu,
GdkScreen *screen; GdkScreen *screen;
GdkWindow *window; GdkWindow *window;
GtkAlign align; GtkAlign align;
GtkTextDirection direction;
gtk_widget_get_preferred_size (GTK_WIDGET (priv->popup), gtk_widget_get_preferred_size (GTK_WIDGET (priv->popup),
&menu_req, NULL); &menu_req, NULL);
window = gtk_widget_get_window (widget); window = gtk_widget_get_window (widget);
direction = gtk_widget_get_direction (widget);
align = gtk_widget_get_valign (GTK_WIDGET (menu)); align = gtk_widget_get_valign (GTK_WIDGET (menu));
screen = gtk_widget_get_screen (GTK_WIDGET (menu)); screen = gtk_widget_get_screen (GTK_WIDGET (menu));
monitor_num = gdk_screen_get_monitor_at_window (screen, window); monitor_num = gdk_screen_get_monitor_at_window (screen, window);
@ -353,7 +355,9 @@ menu_position_side_func (GtkMenu *menu,
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
if (priv->arrow_type == GTK_ARROW_RIGHT) if ((priv->arrow_type == GTK_ARROW_RIGHT && direction == GTK_TEXT_DIR_LTR) ||
(priv->arrow_type == GTK_ARROW_LEFT && direction == GTK_TEXT_DIR_RTL))
{ {
if (*x + allocation.width + menu_req.width <= monitor.x + monitor.width) if (*x + allocation.width + menu_req.width <= monitor.x + monitor.width)
*x += allocation.width; *x += allocation.width;