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

GtkMenu: take csd shadows into account for placement

Browse Source 
When placing menus, we don't want the shadow to influence
our choice.

https://bugzilla.gnome.org/show_bug.cgi?id=731187
This commit is contained in:
Matthias Clasen
2014-06-06 18:00:36 -04:00
parent bde4e86357
commit e9ed210b0b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkmenu.c
View File

@ -111,6 +111,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkwindowprivate.h"
#include "deprecated/gtktearoffmenuitem.h" #include "deprecated/gtktearoffmenuitem.h"
@ -4474,6 +4475,7 @@ gtk_menu_position (GtkMenu *menu,
GdkScreen *pointer_screen; GdkScreen *pointer_screen;
GdkRectangle monitor; GdkRectangle monitor;
GdkDevice *pointer; GdkDevice *pointer;
GtkBorder border;
widget = GTK_WIDGET (menu); widget = GTK_WIDGET (menu);
@ -4485,8 +4487,11 @@ gtk_menu_position (GtkMenu *menu,
* the right place to popup the menu. * the right place to popup the menu.
*/ */
gtk_widget_realize (priv->toplevel); gtk_widget_realize (priv->toplevel);
requisition.width = gtk_widget_get_allocated_width (widget);
requisition.height = gtk_widget_get_allocated_height (widget); _gtk_window_get_shadow_width (GTK_WINDOW (priv->toplevel), &border);
requisition.width = gtk_widget_get_allocated_width (widget)- border.left - border.right;
requisition.height = gtk_widget_get_allocated_height (widget) - border.top - border.bottom;
if (pointer_screen != screen) if (pointer_screen != screen)
{ {
@ -4658,6 +4663,9 @@ gtk_menu_position (GtkMenu *menu,
x = CLAMP (x, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width)); x = CLAMP (x, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width));
x -= border.left;
y -= border.top;
if (GTK_MENU_SHELL (menu)->priv->active) if (GTK_MENU_SHELL (menu)->priv->active)
{ {
priv->have_position = TRUE; priv->have_position = TRUE;