From 2bf9a353a63e6b715a99540f15802de4b2779a70 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 15 May 2019 16:29:06 +0100
Subject: [PATCH] Fix panel/tray size calculation on resize

---
 .../@node-red/editor-client/src/js/ui/common/panels.js   | 9 +++++++--
 .../@node-red/editor-client/src/js/ui/tray.js            | 5 +++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js
index b4819e278..5a82f9d35 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js
@@ -87,10 +87,10 @@ RED.panels = (function() {
             resize: function(size) {
                 var panelSizes;
                 if (vertical) {
-                    panelSizes = [$(children[0]).height(),$(children[1]).height()];
+                    panelSizes = [$(children[0]).outerHeight(),$(children[1]).outerHeight()];
                     container.height(size);
                 } else {
-                    panelSizes = [$(children[0]).width(),$(children[1]).width()];
+                    panelSizes = [$(children[0]).outerWidth(),$(children[1]).outerWidth()];
                     container.width(size);
                 }
                 if (modifiedSizes) {
@@ -106,6 +106,11 @@ RED.panels = (function() {
                     }
                 }
                 if (options.resize) {
+                    if (vertical) {
+                        panelSizes = [$(children[0]).height(),$(children[1]).height()];
+                    } else {
+                        panelSizes = [$(children[0]).width(),$(children[1]).width()];
+                    }
                     options.resize(panelSizes[0],panelSizes[1]);
                 }
             }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
index 57d423e67..743fb3bb7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
@@ -184,8 +184,6 @@ RED.tray = (function() {
     function handleWindowResize() {
         if (stack.length > 0) {
             var tray = stack[stack.length-1];
-            var trayHeight = tray.tray.height()-tray.header.outerHeight()-tray.footer.outerHeight();
-            tray.body.height(trayHeight);
             if (tray.options.maximized || tray.width > $("#red-ui-editor-stack").position().left-8) {
                 tray.width = $("#red-ui-editor-stack").position().left-8;
                 tray.tray.width(tray.width);
@@ -195,9 +193,12 @@ RED.tray = (function() {
                 tray.tray.width(tray.width);
                 // tray.body.parent().width(tray.width);
             }
+            var trayHeight = tray.tray.height()-tray.header.outerHeight()-tray.footer.outerHeight();
+            tray.body.height(trayHeight);
             if (tray.options.resize) {
                 tray.options.resize({width:tray.width, height:trayHeight});
             }
+
         }
     }