From 493bc485f17f27173b41a7132d5ee58af84f145d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 28 Nov 2014 14:00:40 +0000
Subject: [PATCH] fix resize to work with zoom at least up to 125%, by calling
 resize a 2. time

---
 phpgwapi/js/jsapi/egw.js | 55 +++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js
index 94b9a9d445..e618398cf7 100644
--- a/phpgwapi/js/jsapi/egw.js
+++ b/phpgwapi/js/jsapi/egw.js
@@ -228,6 +228,38 @@
 			window.framework.setSidebox.apply(window.framework, JSON.parse(sidebox));
 		}
 
+		var resize_attempt = 0;
+		var resize_popup = function()
+		{
+			var $main_div = $j('#popupMainDiv');
+			var $et2 = $j('.et2_container');
+			var w = {
+				width: egw_getWindowInnerWidth(),
+				height: egw_getWindowInnerHeight()
+			};
+			// Use et2_container for width since #popupMainDiv is full width, but we still need
+			// to take padding/margin into account
+			var delta_width = w.width - ($et2.outerWidth(true) + ($main_div.outerWidth(true) - $main_div.width()));
+			var delta_height = w.height - ($et2.outerHeight(true) + ($main_div.outerHeight(true) - $main_div.height()));
+			if (delta_height && egw_getWindowOuterHeight() >= egw.availHeight())
+			{
+				delta_height = 0;
+			}
+			if(delta_width != 0 || delta_height != 0)
+			{
+				window.resizeTo(egw_getWindowOuterWidth() - delta_width+8, egw_getWindowOuterHeight() - delta_height+10);
+			}
+			// trigger a 2. resize, as one is not enough, if window is zoomed
+			if (delta_width && ++resize_attempt < 2)
+			{
+				window.setTimeout(resize_popup, 50);
+			}
+			else
+			{
+				resize_attempt = 0;
+			}
+		};
+
 		// rest needs DOM to be ready
 		$j(function() {
 			// load etemplate2 template(s)
@@ -237,27 +269,8 @@
 				if(popup || window.opener)
 				{
 					// Resize popup when et2 load is done
-					jQuery(node).on("load",function() {
-						window.setTimeout(function() {
-							var $main_div = $j('#popupMainDiv');
-							var $et2 = $j('.et2_container');
-							var w = {
-								width: egw_getWindowInnerWidth(),
-								height: egw_getWindowInnerHeight()
-							};
-							// Use et2_container for width since #popupMainDiv is full width, but we still need
-							// to take padding/margin into account
-							var delta_width = w.width - ($et2.outerWidth(true) + ($main_div.outerWidth(true) - $main_div.width()));
-							var delta_height = w.height - ($et2.outerHeight(true) + ($main_div.outerHeight(true) - $main_div.height()));
-							if (delta_height && egw_getWindowOuterHeight() >= egw.availHeight())
-							{
-								delta_height = 0;
-							}
-							if(delta_width != 0 || delta_height != 0)
-							{
-								window.resizeTo(egw_getWindowOuterWidth() - delta_width,egw_getWindowOuterHeight() - delta_height);
-							}
-						}, 200);
+					jQuery(node).on('load', function() {
+						window.setTimeout(resize_popup, 50);
 					});
 				}
 				var et2 = new etemplate2(node, currentapp+".etemplate_new.ajax_process_content.etemplate");