diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index a2285ca2a5..ad388a63ac 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -731,8 +731,11 @@ define([ this.binding.winclose = function(obj) { if (me.$window && me.isVisible() && me.$window == obj.$window) me.close(); }; + this.binding.onAppRepaint = _.bind(this.onAppRepaint, this); + this.binding.onThemeChanged = _.bind(this.onThemeChanged, this); Common.NotificationCenter.on('window:close', this.binding.winclose); - Common.NotificationCenter.on('app:repaint', _.bind(this.onAppRepaint, this)); + Common.NotificationCenter.on('app:repaint', this.binding.onAppRepaint); + Common.NotificationCenter.on('uitheme:changed', this.binding.onThemeChanged); this.initConfig.footerCls && this.$window.find('.footer').addClass(this.initConfig.footerCls); @@ -855,6 +858,8 @@ define([ this.$window.find('.header').off('mousedown', this.binding.dragStart); } Common.NotificationCenter.off({'window:close': this.binding.winclose}); + Common.NotificationCenter.off('app:repaint', this.binding.onAppRepaint); + Common.NotificationCenter.off('uitheme:changed', this.binding.onThemeChanged); if (this.initConfig.modal) { var mask = _getMask(), @@ -1067,6 +1072,12 @@ define([ } }, + onThemeChanged: function() { + if (!this.$window || !this.isVisible()) return; + + _autoSize.call(this); + }, + suspendKeyEvents: function () { this.pauseKeyEvents = false; }, diff --git a/apps/common/main/lib/template/AutoCorrectDialog.template b/apps/common/main/lib/template/AutoCorrectDialog.template index fe35970477..97e6542650 100644 --- a/apps/common/main/lib/template/AutoCorrectDialog.template +++ b/apps/common/main/lib/template/AutoCorrectDialog.template @@ -2,7 +2,7 @@
- @@ -13,18 +13,18 @@ - - -
+
+
+
+ @@ -37,7 +37,7 @@
- @@ -47,12 +47,12 @@ - -
+
+
+ @@ -101,8 +101,8 @@
- @@ -112,7 +112,7 @@ - @@ -123,12 +123,12 @@ - - ', '', '', - '', '
-
+ 		+
+
+
+ diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js index ba7cc10e98..4b1f1da99d 100644 --- a/apps/common/main/lib/view/AdvancedSettingsWindow.js +++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js @@ -105,10 +105,10 @@ define([], function () { 'use strict'; btn.on('click', _.bind(me.onCategoryClick, me, btn, index)); me.btnsCategory.push(btn); }); - var cnt_panel = $window.find('.content-panel'), - menu_panel = $window.find('.menu-panel'); - cnt_panel.width(this.contentWidth); - $window.width(((menu_panel.length>0) ? menu_panel.outerWidth() : 0) + cnt_panel.outerWidth() + 2); + let menu_panel = $window.find('.menu-panel'); + this.content_panel = $window.find('.content-panel'); + this.content_panel.width(this.contentWidth); + $window.width(((menu_panel.length>0) ? menu_panel.outerWidth() : 0) + this.content_panel.outerWidth() + 2); if (this.options.contentHeight) { $window.find('.body > .box').css('height', this.options.contentHeight); @@ -124,7 +124,7 @@ define([], function () { 'use strict'; this.btnsCategory[0].toggle(true, true); var onMainWindowResize = function(){ - $window.width(((menu_panel.length>0) ? menu_panel.outerWidth() : 0) + cnt_panel.outerWidth() + 2); + $window.width(((menu_panel.length>0) ? menu_panel.outerWidth() : 0) + this.content_panel.outerWidth() + 2); }; $(window).on('resize', onMainWindowResize); this.on('close', function() { @@ -152,6 +152,11 @@ define([], function () { 'use strict'; $window.find('.body > .box').css('height', height); }, + fixHeight: function() { // check height of the content + let diff = this.content_panels.filter('.active').height() - this.content_panel.height(); + (diff>0) && this.setInnerHeight(parseInt(this.$window.find('.body > .box').css('height')) + diff); + }, + onDlgBtnClick: function(event) { var state = event.currentTarget.attributes['result'].value; if ( this.handler && this.handler.call(this, state, (state == 'ok') ? this.getSettings() : undefined) ) @@ -162,6 +167,7 @@ define([], function () { 'use strict'; onCategoryClick: function(btn, index) { this.content_panels.filter('.active').removeClass('active'); $("#" + btn.options.contentTarget).addClass("active"); + this.fixHeight(); }, getSettings: function() { @@ -209,6 +215,11 @@ define([], function () { 'use strict'; Common.UI.Window.prototype.close.call(this, suppressevent); }, + onThemeChanged: function() { + Common.UI.Window.prototype.onThemeChanged.call(this); + this.fixHeight(); + }, + onAnimateAfter: function() { } diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index 45dd59e010..3802820d9f 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -49,7 +49,7 @@ define([ Common.Views.AutoCorrectDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 375, - contentHeight: 345, + contentHeight: 355, buttons: ['close'], toggleGroup: 'autocorrect-dialog-group' }, diff --git a/apps/common/main/resources/less/colors-table-white.less b/apps/common/main/resources/less/colors-table-white.less index ec8fb49b98..d36c0be2b6 100644 --- a/apps/common/main/resources/less/colors-table-white.less +++ b/apps/common/main/resources/less/colors-table-white.less @@ -188,8 +188,8 @@ --layout-padding-left-panel-rtl: 10px 40px 8px 3px; --layout-padding-right-panel: 10px 4px 8px 3px; --layout-padding-right-panel-rtl: 10px 3px 8px 4px; - --layout-padding-right-panel-content: 0 12px 0 12px; - --layout-padding-right-panel-content-rtl: 0 12px 0 12px; + --layout-padding-right-panel-content: 5px 12px 0 12px; + --layout-padding-right-panel-content-rtl: 5px 12px 0 12px; --layout-padding-x-side-panel: 6px; --layout-padding-y-side-panel: 4px; diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 198700ea2b..e68d914374 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -237,8 +237,8 @@ --shadow-toolbar: 0px 1px 0 0 var(--border-toolbar); --shadow-side-panel: none; --layout-padding-toolbar: 0; - --layout-padding-right-panel-content: 0 10px 0 15px; - --layout-padding-right-panel-content-rtl: 0 15px 0 10px; + --layout-padding-right-panel-content: 7px 10px 0 15px; + --layout-padding-right-panel-content-rtl: 7px 15px 0 10px; --layout-padding-right-panel: 0; --layout-padding-right-panel-rtl: 0; --layout-padding-left-panel: 0 0 0 40px; diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index 255a4a590e..0357079f08 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -363,7 +363,6 @@ label { .settings-panel { display: none; overflow: visible; - margin-top: 7px; & > table { width: 100%; diff --git a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template index dfc607a71e..659e8c0cb5 100644 --- a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template @@ -168,7 +168,7 @@
-
+
diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index b7d737d45b..5996a45e8d 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -79,8 +79,8 @@ define([ '
', - '
', + '		', + '
', '
', '
', //Invisible button, needed for boostrap dropdown logic to work @@ -136,7 +136,6 @@ define([ allowBlank : true, validateOnChange: true, validateOnBlur: true, - style : this.appOptions.canMakeActionLink ? 'width: 202px;' : 'width: 215px;', value : '', maxLength: 40, validation : function(value) { diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index 952706fc0a..383cbb6882 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -48,8 +48,7 @@ define([ DE.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({ options: { type: 0, // 0 - markers, 1 - numbers, 2 - multilevel - width: 300, - height: 460, + width: 320, style: 'min-width: 240px;', cls: 'modal-dlg', split: false, @@ -62,8 +61,7 @@ define([ this.rightPanelWidth = 210; _.extend(this.options, { title: this.txtTitle, - height: (this.type===2) ? 451 : (this.type===1 ? 470 : 424), - width: (this.type===2) ? 415 + (this.extended ? this.rightPanelWidth : 0) : 300 + width: (this.type===2) ? 415 + (this.extended ? this.rightPanelWidth : 0) : 320 }, options || {}); this.template = [ @@ -124,7 +122,7 @@ define([ '
', '', - '
', + '
', '
', '
', '
', @@ -364,7 +362,7 @@ define([ this.cmbFormat = new Common.UI.ComboBoxCustom({ el : $window.find('#id-dlg-numbering-format'), menuStyle : 'min-width: 100%;max-height: 220px;', - style : this.type===2 ? "width: 100%;" : "width: 129px;", + style : this.type===2 ? "width: 100%;" : "width: 139px;", editable : false, template : _.template(template.join('')), itemsTemplate: _.template(itemsTemplate.join('')), diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 19b0c4d06e..65bd971981 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -46,7 +46,7 @@ define([ DE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 370, - contentHeight: 330, + contentHeight: 340, toggleGroup: 'paragraph-adv-settings-group', storageName: 'de-para-settings-adv-category' },