From 995ac416dd9facffd877f55487cfdbece2e92c33 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 26 Sep 2012 11:21:01 +0200 Subject: [PATCH] hack: call setHeight to show scroll bars correctly --- debian/changelog.Debian | 6 ++++++ defines.mk | 2 +- www/manager/qemu/Snapshot.js | 2 +- www/manager/storage/IScsiEdit.js | 8 ++++++++ www/manager/storage/LVMEdit.js | 10 +++++++++- www/manager/storage/NFSEdit.js | 8 ++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/debian/changelog.Debian b/debian/changelog.Debian index 1948c59d..c9a89e4a 100644 --- a/debian/changelog.Debian +++ b/debian/changelog.Debian @@ -1,3 +1,9 @@ +pve-manager (2.2-18) unstable; urgency=low + + * add workaroud to correctly show scrollbars + + -- Proxmox Support Team Wed, 26 Sep 2012 11:22:16 +0200 + pve-manager (2.2-17) unstable; urgency=low * add snapshot support to GUI diff --git a/defines.mk b/defines.mk index 98768ae8..eb1cc494 100644 --- a/defines.mk +++ b/defines.mk @@ -2,7 +2,7 @@ RELEASE=2.2 VERSION=2.2 PACKAGE=pve-manager -PACKAGERELEASE=17 +PACKAGERELEASE=18 BINDIR=${DESTDIR}/usr/bin PERLLIBDIR=${DESTDIR}/usr/share/perl5 diff --git a/www/manager/qemu/Snapshot.js b/www/manager/qemu/Snapshot.js index c73fff31..1fefadf9 100644 --- a/www/manager/qemu/Snapshot.js +++ b/www/manager/qemu/Snapshot.js @@ -157,7 +157,7 @@ Ext.define('PVE.window.Snapshot', { border: false, layout: 'fit', buttons: [ submitBtn ], - items: me.formPanel + items: [ me.formPanel ] }); if (me.snapname) { diff --git a/www/manager/storage/IScsiEdit.js b/www/manager/storage/IScsiEdit.js index b3c6026e..bf72fcc1 100644 --- a/www/manager/storage/IScsiEdit.js +++ b/www/manager/storage/IScsiEdit.js @@ -47,6 +47,14 @@ Ext.define('PVE.storage.IScsiScan', { matchFieldWidth: false, listConfig: { loadingText: 'Scanning...', + listeners: { + // hack: call setHeight to show scroll bars correctly + refresh: function(list) { + var lh = PVE.Utils.gridLineHeigh(); + var count = store.getCount(); + list.setHeight(lh * ((count > 10) ? 10 : count)); + } + }, width: 350 } }); diff --git a/www/manager/storage/LVMEdit.js b/www/manager/storage/LVMEdit.js index 72d40156..5c26cbc7 100644 --- a/www/manager/storage/LVMEdit.js +++ b/www/manager/storage/LVMEdit.js @@ -25,7 +25,15 @@ Ext.define('PVE.storage.VgSelector', { queryMode: 'local', editable: false, listConfig: { - loadingText: 'Scanning...' + loadingText: 'Scanning...', + listeners: { + // hack: call setHeight to show scroll bars correctly + refresh: function(list) { + var lh = PVE.Utils.gridLineHeigh(); + var count = store.getCount(); + list.setHeight(lh * ((count > 10) ? 10 : count)); + } + } } }); diff --git a/www/manager/storage/NFSEdit.js b/www/manager/storage/NFSEdit.js index 520d4908..9ff19976 100644 --- a/www/manager/storage/NFSEdit.js +++ b/www/manager/storage/NFSEdit.js @@ -47,6 +47,14 @@ Ext.define('PVE.storage.NFSScan', { matchFieldWidth: false, listConfig: { loadingText: 'Scanning...', + listeners: { + // hack: call setHeight to show scroll bars correctly + refresh: function(list) { + var lh = PVE.Utils.gridLineHeigh(); + var count = store.getCount(); + list.setHeight(lh * ((count > 10) ? 10 : count)); + } + }, width: 350 } });