From deec1aa2a27b2e2a9301b662ec133e5a170fb3e3 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Thu, 16 May 2013 12:13:18 +0000 Subject: [PATCH] Fix the auto-resize (fit) of the dialog's content. SVN:trunk[2740] --- js/extkeywidget.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/js/extkeywidget.js b/js/extkeywidget.js index 55fe177a4..89863eda6 100644 --- a/js/extkeywidget.js +++ b/js/extkeywidget.js @@ -116,16 +116,17 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper var searchForm = dlg.find('div.display_block:first'); // Top search form, enclosing display_block var results = $('#dr_'+me.id); var oPadding = {}; - for(k in ['top', 'right', 'bottom', 'left']) + var aKeys = ['top', 'right', 'bottom', 'left']; + for(k in aKeys) { - oPadding[k] = 0; - if (dlg.css('padding-'+k)) + oPadding[aKeys[k]] = 0; + if (dlg.css('padding-'+aKeys[k])) { - oPadding[k] = parseInt(dlg.css('padding-'+k).replace('px', '')); + oPadding[aKeys[k]] = parseInt(dlg.css('padding-'+aKeys[k]).replace('px', '')); } } - width = dlg.innerWidth() - oPadding.right - oPadding.left - 22; // 5 (margin-left) + 5 (padding-left) + 5 (padding-right) + 5 (margin-right) + 2 for rounding ! - height = dlg.innerHeight() - oPadding.top - oPadding.bottom -22; + width = dlg.innerWidth() - oPadding['right'] - oPadding['left'] - 22; // 5 (margin-left) + 5 (padding-left) + 5 (padding-right) + 5 (margin-right) + 2 for rounding ! + height = dlg.innerHeight() - oPadding['top'] - oPadding['bottom'] -22; form_height = searchForm.outerHeight(); results.height(height - form_height - 40); // Leave some space for the buttons }; @@ -199,6 +200,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper $('#count_'+me.id).change(function(){ me.UpdateButtons(); }); + me.UpdateSizes(); }, 'html' );