diff --git a/apps/common/main/lib/component/Layout.js b/apps/common/main/lib/component/Layout.js index 6e5c08a4b..c802f1a1a 100644 --- a/apps/common/main/lib/component/Layout.js +++ b/apps/common/main/lib/component/Layout.js @@ -152,7 +152,8 @@ define([ fmin : panel.resize.fmin, fmax : panel.resize.fmax, behaviour : panel.behaviour, - index : this.splitters.length + index : this.splitters.length, + offset : panel.resize.offset || 0 }; if (!stretch) { @@ -492,7 +493,10 @@ define([ if ( !panel.stretch ) { style = panel.el.is(':visible'); if ( style ) { - width += (panel.rely!==true ? panel.width : this.getElementWidth(panel.el)); + if (panel.isresizer) + width += panel.offset; + else + width += (panel.rely!==true ? panel.width : this.getElementWidth(panel.el)); } if (panel.resize && panel.resize.autohide !== false && panel.resize.el) { @@ -514,10 +518,13 @@ define([ width = 0; this.panels.forEach(function(panel){ if (panel.el.is(':visible')) { - style = {left: width}; + style = {left: width - (panel.isresizer ? panel.width : 0)}; panel.rely!==true && (style.width = panel.width); panel.el.css(style); - width += this.getElementWidth(panel.el); + if (panel.isresizer) + width += panel.offset; + else + width += this.getElementWidth(panel.el); } },this); } diff --git a/apps/common/main/resources/less/layout.less b/apps/common/main/resources/less/layout.less index be1731a55..d447dfe85 100644 --- a/apps/common/main/resources/less/layout.less +++ b/apps/common/main/resources/less/layout.less @@ -49,7 +49,7 @@ } > .layout-resizer { - width: 2px; + width: 4px; cursor: col-resize; &.move { diff --git a/apps/spreadsheeteditor/main/app/view/Viewport.js b/apps/spreadsheeteditor/main/app/view/Viewport.js index 896a7de93..fa83866b0 100644 --- a/apps/spreadsheeteditor/main/app/view/Viewport.js +++ b/apps/spreadsheeteditor/main/app/view/Viewport.js @@ -112,7 +112,8 @@ define([ hidden: true, autohide: false, min: 300, - max: 600 + max: 600, + offset: 4 } }, { el: items[1],