Commit fecd2848eb45f2bc265df04af1b485a3187b0d75
1 parent
67bd4723
Exists in
master
and in
111 other branches
Fix panel/grid sizes issue.
Showing
3 changed files
with
9 additions
and
11 deletions
Show diff stats
js/app/controllers/InteropModule.js
@@ -28,8 +28,8 @@ Ext.define('amdaDesktop.InteropModule', { | @@ -28,8 +28,8 @@ Ext.define('amdaDesktop.InteropModule', { | ||
28 | * @cfg {String} window definitions | 28 | * @cfg {String} window definitions |
29 | * @required | 29 | * @required |
30 | */ | 30 | */ |
31 | - height: 650, | ||
32 | - width: 1050, | 31 | + // height: 650, |
32 | + // width: 1050, | ||
33 | uiType : 'panelInterop', | 33 | uiType : 'panelInterop', |
34 | helpTitle :'Help on Interop Module', | 34 | helpTitle :'Help on Interop Module', |
35 | helpFile: 'interopHelp.html', | 35 | helpFile: 'interopHelp.html', |
@@ -436,11 +436,10 @@ Ext.define('amdaDesktop.InteropModule', { | @@ -436,11 +436,10 @@ Ext.define('amdaDesktop.InteropModule', { | ||
436 | win = desktop.createWindow({ | 436 | win = desktop.createWindow({ |
437 | id: this.id, | 437 | id: this.id, |
438 | title:this.title, | 438 | title:this.title, |
439 | - layout: 'anchor', | ||
440 | - width: 800, | ||
441 | - height: 600, | ||
442 | - minWidth: 650, | ||
443 | - minimizable: false, | 439 | + layout: 'fit', |
440 | + minWidth: 650, | ||
441 | + minHeight: 350, | ||
442 | + minimizable: false, | ||
444 | iconCls: this.icon, | 443 | iconCls: this.icon, |
445 | animCollapse:false, | 444 | animCollapse:false, |
446 | constrainHeader:true, | 445 | constrainHeader:true, |
js/app/views/EpnTapUI.js
@@ -406,7 +406,6 @@ Ext.define('amdaUI.EpnTapUI', { | @@ -406,7 +406,6 @@ Ext.define('amdaUI.EpnTapUI', { | ||
406 | var myConf = { | 406 | var myConf = { |
407 | id: 'epntapTab', | 407 | id: 'epntapTab', |
408 | title: 'EPN-TAP', | 408 | title: 'EPN-TAP', |
409 | - layout: 'fit', | ||
410 | items: [{ | 409 | items: [{ |
411 | xtype: 'container', | 410 | xtype: 'container', |
412 | layout: { type: 'vbox', pack: 'start', align: 'stretch'}, | 411 | layout: { type: 'vbox', pack: 'start', align: 'stretch'}, |
@@ -585,8 +584,7 @@ Ext.define('amdaUI.EpnTapUI', { | @@ -585,8 +584,7 @@ Ext.define('amdaUI.EpnTapUI', { | ||
585 | xtype: 'panel', | 584 | xtype: 'panel', |
586 | id: 'epnTapGridsPanel', | 585 | id: 'epnTapGridsPanel', |
587 | layout: 'fit', | 586 | layout: 'fit', |
588 | - height: 440, | ||
589 | - region: 'center', | 587 | + flex: 1, |
590 | items: [{ | 588 | items: [{ |
591 | xtype: 'container', | 589 | xtype: 'container', |
592 | layout: { type: 'hbox', pack: 'start', align: 'stretch'}, | 590 | layout: { type: 'hbox', pack: 'start', align: 'stretch'}, |
js/app/views/InteropUI.js
@@ -111,9 +111,10 @@ Ext.define('amdaUI.InteropUI', { | @@ -111,9 +111,10 @@ Ext.define('amdaUI.InteropUI', { | ||
111 | 111 | ||
112 | var myConf = { | 112 | var myConf = { |
113 | plain: true, | 113 | plain: true, |
114 | + width: 800, | ||
115 | + height: 600, | ||
114 | activeTab: activeTab, | 116 | activeTab: activeTab, |
115 | defaults: { | 117 | defaults: { |
116 | - autoHeight: true, | ||
117 | layout: 'fit', | 118 | layout: 'fit', |
118 | bodyStyle: { background: '#dfe8f6' } | 119 | bodyStyle: { background: '#dfe8f6' } |
119 | }, | 120 | }, |