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

[DE] Fix resize insert tab

Browse source
This commit is contained in:
Julia Radzhabova 2021-12-22 01:22:05 +03:00
parent 96d2d081ed
commit c9e50231d1
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/common/main/lib/component/Mixtbar.js
View file

@ -526,10 +526,11 @@ define([
more_section_width = parseInt(more_section.css('width')) || 0, more_section_width = parseInt(more_section.css('width')) || 0,
boxpanels_offset = this.$boxpanels.offset(), boxpanels_offset = this.$boxpanels.offset(),
boxpanels_outer_width = this.$boxpanels.outerWidth(), boxpanels_outer_width = this.$boxpanels.outerWidth(),
boxpanels_width = boxpanels_outer_width,
boxpanels_inner_width = this.$boxpanels.width(), boxpanels_inner_width = this.$boxpanels.width(),
boxpanels_width = more_section.is(':visible') ? boxpanels_outer_width - more_section_width : boxpanels_inner_width, // more section has absolute position -> use outer width delta = (this._prevBoxWidth) ? (boxpanels_outer_width - this._prevBoxWidth) : -1;
delta = (this._prevBoxWidth) ? (boxpanels_inner_width - this._prevBoxWidth) : -1; this._prevBoxWidth = boxpanels_outer_width;
this._prevBoxWidth = boxpanels_inner_width; more_section.is(':visible') && (boxpanels_width -= more_section_width); // more section has absolute position -> use outer width
var boxpanels_right = boxpanels_offset.left + boxpanels_width; var boxpanels_right = boxpanels_offset.left + boxpanels_width;
@ -659,7 +660,6 @@ define([
} }
var item_width = parseInt(item.attr('inner-width') || 0); var item_width = parseInt(item.attr('inner-width') || 0);
var children = item.children();
if (active_width + last_width + item_width < boxpanels_width && item.attr('group-state') != 'open') { if (active_width + last_width + item_width < boxpanels_width && item.attr('group-state') != 'open') {
// move group // move group
more_section.before(item); more_section.before(item);
@ -670,8 +670,9 @@ define([
this.hideMoreBtns(); this.hideMoreBtns();
more_section.css('display', "none"); more_section.css('display', "none");
} }
} else if ( active_width + last_width < boxpanels_width && children.length>1 ) { // if only one child in group - don't move child. try to move whole group } else if ( active_width + last_width < boxpanels_width) {
// move buttons from group // move buttons from group
var children = item.children();
boxpanels_width = boxpanels_outer_width - more_section_width; boxpanels_width = boxpanels_outer_width - more_section_width;
for (var j=0; j<children.length; j++) { for (var j=0; j<children.length; j++) {
if (islast && j==children.length-1) if (islast && j==children.length-1)

2
apps/common/main/resources/less/toolbar.less
View file

@ -222,7 +222,7 @@
} }
} }
.more-box .group { .more-box {
background-color: @background-toolbar-ie; background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }