r43824 - in /desktop/unstable/gtk+3.0/debian: changelog patches/077_fix_menu_height_calculating.patch patches/series

[mitya57-guest at users.alioth.debian.org]

Author: mitya57-guest
Date: Tue Nov  4 14:08:30 2014
New Revision: 43824

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43824
Log:
debian/patches/077_fix_menu_height_calculating.patch: backport upstream
commit to fix calculation of menu height (closes: #767906).

Added:
    desktop/unstable/gtk+3.0/debian/patches/077_fix_menu_height_calculating.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/series

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=43824&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Tue Nov  4 14:08:30 2014
@@ -1,6 +1,11 @@
 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 at ubuntu.com>  Sun, 26 Oct 2014 18:37:46 +0100
 

Added: desktop/unstable/gtk+3.0/debian/patches/077_fix_menu_height_calculating.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/077_fix_menu_height_calculating.patch?rev=43824&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/077_fix_menu_height_calculating.patch	(added)
+++ desktop/unstable/gtk+3.0/debian/patches/077_fix_menu_height_calculating.patch	[utf-8] Tue Nov  4 14:08:30 2014
@@ -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);
+         }
+     }
+ 

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=43824&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Tue Nov  4 14:08:30 2014
@@ -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