Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Fix statusbar for small screens, when filters applied

Browse source
This commit is contained in:
JuliaSvinareva 2020-04-27 15:08:17 +03:00
parent 66575bd40b
commit 4c9ea49c33
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/TabBar.js
View file

@ -543,7 +543,7 @@ define([
this.checkInvisible(suppress); this.checkInvisible(suppress);
} else if ( index >= (this.tabs.length - 1) || index == 'last') { } else if ( index >= (this.tabs.length - 1) || index == 'last') {
var tab = this.tabs[this.tabs.length-1].$el; var tab = this.tabs[this.tabs.length-1].$el;
this.$bar.scrollLeft(this.$bar.scrollLeft() + (tab.position().left + parseInt(tab.css('width')) - this.$bar.width()) + 20); this.$bar.scrollLeft(this.$bar.scrollLeft() + (tab.position().left + parseInt(tab.css('width')) - this.$bar.width()) + (this.$bar.width() > 400 ? 20 : 5));
this.checkInvisible(suppress); this.checkInvisible(suppress);
} else { } else {
var rightbound = this.$bar.width(), var rightbound = this.$bar.width(),
@ -555,7 +555,7 @@ define([
right = tab.position().left + parseInt(tab.css('width')); right = tab.position().left + parseInt(tab.css('width'));
if (right > rightbound) { if (right > rightbound) {
this.$bar.scrollLeft(this.$bar.scrollLeft() + (right - rightbound) + 20); this.$bar.scrollLeft(this.$bar.scrollLeft() + (right - rightbound) + (this.$bar.width() > 400 ? 20 : 5));
this.checkInvisible(suppress); this.checkInvisible(suppress);
break; break;
} }

1
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -445,7 +445,6 @@ define([
this.tabbar.setTabVisible(sindex); this.tabbar.setTabVisible(sindex);
this.btnAddWorksheet.setDisabled(me.mode.isDisconnected || me.api.asc_isWorkbookLocked() || me.api.isCellEdited); this.btnAddWorksheet.setDisabled(me.mode.isDisconnected || me.api.asc_isWorkbookLocked() || me.api.isCellEdited);
$('#status-addtabs-box').css('border-right', 'none');
$('#status-label-zoom').text(Common.Utils.String.format(this.zoomText, Math.floor((this.api.asc_getZoom() +.005)*100))); $('#status-label-zoom').text(Common.Utils.String.format(this.zoomText, Math.floor((this.api.asc_getZoom() +.005)*100)));
me.fireEvent('sheet:changed', [me, sindex]); me.fireEvent('sheet:changed', [me, sindex]);

9
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

@ -142,7 +142,7 @@
height: 32px; height: 32px;
left: 112px; left: 112px;
right: 160px; right: 160px;
margin-right: 2px; margin-right: 3px;
} }
#status-sheets-bar { #status-sheets-bar {
@ -155,10 +155,17 @@
.nav-tabs { .nav-tabs {
height: 100%; height: 100%;
display: flex;
> li { > li {
background-color: @gray-light; background-color: @gray-light;
&:first-of-type {
span {
border-left: none;
}
}
> span { > span {
display: inline-block; display: inline-block;
.border-radius(0); .border-radius(0);