debian/patches/077_fix_menu_height_calculating.patch: backport upstream

commit to fix calculation of menu height (closes: #767906).

debian/changelog

@@ -1,7 +1,12 @@
 gtk+3.0 (3.14.4-2) UNRELEASED; urgency=medium
 
+  [ Rico Tzschichholz ]
   * Install org.gtk.Settings.Debug.gschema.xml
 
+  [ Dmitry Shachnev ]
+  * debian/patches/077_fix_menu_height_calculating.patch: backport upstream
+    commit to fix calculation of menu height (closes: #767906).
+
  -- Rico Tzschichholz <ricotz@ubuntu.com>  Sun, 26 Oct 2014 18:37:46 +0100
 
 gtk+3.0 (3.14.4-1) unstable; urgency=medium

debian/patches/077_fix_menu_height_calculating.patch

@@ -0,0 +1,30 @@
+Description: gtkmenu: fix unnecessary scroll buttons
+Origin: upstream, https://git.gnome.org/browse/gtk+/commit/?id=bdaef1f88d44ca26
+Last-Update: 2014-11-04
+
+--- a/gtk/gtkmenu.c
++++ b/gtk/gtkmenu.c
+@@ -3347,6 +3347,7 @@
+     {
+       GdkScreen *screen = gtk_widget_get_screen (priv->toplevel);
+       GdkRectangle monitor;
++      GtkBorder border;
+ 
+       gdk_screen_get_monitor_workarea (screen, priv->monitor_num, &monitor);
+ 
+@@ -3356,10 +3357,12 @@
+       if (priv->position_y + nat_height > monitor.y + monitor.height)
+         nat_height = monitor.y + monitor.height - priv->position_y;
+ 
+-      if (priv->position_y < monitor.y)
++      _gtk_window_get_shadow_width (GTK_WINDOW (priv->toplevel), &border);
++
++      if (priv->position_y + border.top < monitor.y)
+         {
+-          min_height -= monitor.y - priv->position_y;
+-          nat_height -= monitor.y - priv->position_y;
++          min_height -= monitor.y - (priv->position_y + border.top);
++          nat_height -= monitor.y - (priv->position_y + border.top);
+         }
+     }
+ 

debian/patches/series

@@ -12,3 +12,4 @@
 061_multiarch_module_fallback.patch
 071_fix-installation-of-HTML-images.patch
 reftest-known-fail.patch
+077_fix_menu_height_calculating.patch