diff --git a/ds_gui.css b/ds_gui.css index 014387c8a020ac1f4e9765d52092f2b780e50215..2001c7a1b84b3bb92d2513237276aa80987113ef 100644 --- a/ds_gui.css +++ b/ds_gui.css @@ -185,3 +185,7 @@ h1 a { height: 18px; padding-right: 5px; } + +.x-panel .x-panel-body[style^="overflow: scroll auto"] .x-box-inner { + box-shadow: inset 0 -1px 0 #99e8bc; +} \ No newline at end of file diff --git a/js/dss/dss-components/dss-action-selector.js b/js/dss/dss-components/dss-action-selector.js index 7ee1e71b44effa3dede397cc1ec2099f7458da05..5068ea2b0ae195541d6a50bb533974e0b0bfcc4c 100644 --- a/js/dss/dss-components/dss-action-selector.js +++ b/js/dss/dss-components/dss-action-selector.js @@ -855,7 +855,7 @@ Ext.define('DSS.component.ActionConfigurator', { }, setHeight : function(oHeight) { this.macPanel.setHeight(oHeight - 30); - this.iDefaultHeight = oHeight - 57; + this.iDefaultHeight = oHeight - 74; for ( var oKey in this.grids) this.grids[oKey].setHeight(this.iDefaultHeight); this.callParent(arguments); @@ -5404,7 +5404,6 @@ Ext.define('DSS.component.ActionConfigurator', { collapsible : true, collapsed : false, titleCollapse: true, - autoScroll : true, animCollapse : true, height : 320, layout : { @@ -5430,8 +5429,8 @@ Ext.define('DSS.component.ActionConfigurator', { mThis.setMacGrid(mThis.oActualValue); } }, - scroll : 'horizontal' - + overflowX: 'scroll', + overflowY: 'auto' }); Ext.apply(this, { diff --git a/js/dss/dss-components/dss-trigger-selector.js b/js/dss/dss-components/dss-trigger-selector.js index 940d62fdcd4d5c5745d5a92349913432e7280e8c..af03a8a8ea55d27d20d04c09c70989446c49e722 100644 --- a/js/dss/dss-components/dss-trigger-selector.js +++ b/js/dss/dss-components/dss-trigger-selector.js @@ -26,7 +26,7 @@ Ext.define('DSS.component.TriggerConfigurator', { }, setHeight : function(oHeight) { this.macPanel.setHeight(oHeight); - this.iDefaultHeight = oHeight - 2; + this.iDefaultHeight = oHeight - 19; // minus horizontal scroll bar height (always visible) for ( var oKey in this.grids) this.grids[oKey].setHeight(this.iDefaultHeight); this.callParent(arguments); @@ -3291,7 +3291,7 @@ Ext.define('DSS.component.TriggerConfigurator', { this.grids.lvlScene = Ext.create('Ext.grid.Panel', { hideHeaders:true, height : this.iDefaultHeight, - width :(this.getWidth()-(this.iDefaultWidth*3))-2,// 324, + width : (this.getWidth()-(this.iDefaultWidth*3))-2,// 324, autoScroll : true, viewConfig : { stripeRows : true @@ -4118,19 +4118,20 @@ Ext.define('DSS.component.TriggerConfigurator', { this.constructMacGrids(); this.macPanel = Ext.create('Ext.panel.Panel', { - border : '0', - autoScroll : true, - height : 320, - layout : { - type : 'hbox' + border: '0', + height: 320, + layout: { + type: 'hbox' }, - items : [ this.grids.lvl1 ], - scroll : 'horizontal' + items: [ this.grids.lvl1 ], + overflowX: 'scroll', + overflowY: 'auto' }); + Ext.apply(this, { items : [ this.macPanel ] }); - + this.callParent(arguments); }, reset : function() {