From 4926ad7298118860a13030d115ea7fbc87456b0e Mon Sep 17 00:00:00 2001 From: "Julia.Radzhabova" Date: Thu, 2 Oct 2025 20:30:53 +0300 Subject: [PATCH 1/2] Fix hover state for anonymouse user button --- apps/common/main/resources/less/colors-table-ie-fix.less | 3 ++- apps/common/main/resources/less/colors-table-night.less | 3 ++- apps/common/main/resources/less/colors-table-white.less | 3 ++- apps/common/main/resources/less/colors-table.less | 6 ++++-- apps/common/main/resources/less/header.less | 5 +++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/apps/common/main/resources/less/colors-table-ie-fix.less b/apps/common/main/resources/less/colors-table-ie-fix.less index d53ed6c6b1..62965de5e8 100644 --- a/apps/common/main/resources/less/colors-table-ie-fix.less +++ b/apps/common/main/resources/less/colors-table-ie-fix.less @@ -235,7 +235,8 @@ @header-component-height-ie: 100%; @header-component-width-ie: 40px; @header-component-line-height-ie: 1.5; -@header-component-padding-ie: 1px 3px; +@header-component-padding-x-ie: 3px; +@header-component-padding-y-ie: 1px; @header-component-margin-ie: 0; @header-component-align-ie: stretch; diff --git a/apps/common/main/resources/less/colors-table-night.less b/apps/common/main/resources/less/colors-table-night.less index c78054ea92..ddbb3c3972 100644 --- a/apps/common/main/resources/less/colors-table-night.less +++ b/apps/common/main/resources/less/colors-table-night.less @@ -323,7 +323,8 @@ --header-component-height: var(--x-small-btn-size); --header-component-width: var(--x-small-btn-size); --header-component-line-height: var(--x-small-btn-size); - --header-component-padding: 0; + --header-component-padding-x: 0px; + --header-component-padding-y: 0px; --header-component-margin: 0 6px; --header-component-align: center; diff --git a/apps/common/main/resources/less/colors-table-white.less b/apps/common/main/resources/less/colors-table-white.less index e50cf65374..dd7ae7efe3 100644 --- a/apps/common/main/resources/less/colors-table-white.less +++ b/apps/common/main/resources/less/colors-table-white.less @@ -325,7 +325,8 @@ --header-component-height: var(--x-small-btn-size); --header-component-width: var(--x-small-btn-size); --header-component-line-height: var(--x-small-btn-size); - --header-component-padding: 0; + --header-component-padding-x: 0px; + --header-component-padding-y: 0px; --header-component-margin: 0 6px; --header-component-align: center; diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 2650869726..418ed91866 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -363,7 +363,8 @@ // header button --header-component-height: 100%; --header-component-width: 40px; - --header-component-padding: 1px 3px; + --header-component-padding-x: 3px; + --header-component-padding-y: 1px; --header-component-margin: 0; --header-component-line-height: var(--line-height-base, 1.5); --header-component-align: stretch; @@ -634,7 +635,8 @@ @header-component-height: var(--header-component-height); @header-component-width: var(--header-component-width); @header-component-line-height: var(--header-component-line-height); -@header-component-padding: var(--header-component-padding); +@header-component-padding-x: var(--header-component-padding-x); +@header-component-padding-y: var(--header-component-padding-y); @header-component-margin: var(--header-component-margin); @header-component-align: var(--header-component-align); diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 1e951e5cb3..a28d6db2c5 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -233,8 +233,8 @@ width: @header-component-width-ie; width: @header-component-width; border: 0; - padding: @header-component-padding-ie; - padding: @header-component-padding; + padding: @header-component-padding-y-ie @header-component-padding-x-ie; + padding: @header-component-padding-y @header-component-padding-x; .icon { width: @x-small-btn-icon-size-ie; @@ -480,6 +480,7 @@ line-height: 20px; overflow: hidden; margin: 0 6px; + margin: 0 calc((@header-component-width - @header-component-padding-x*2 - 20px)/2); text-align: center; } } From e48b0a47e07e4785523cab378277b8b66a87e52f Mon Sep 17 00:00:00 2001 From: "Julia.Radzhabova" Date: Fri, 3 Oct 2025 00:29:53 +0300 Subject: [PATCH 2/2] Bug 73077 + fix click on preview controls --- .../main/app/view/DocumentPreview.js | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js index 3e5e0f28b8..fa22b2cf3a 100644 --- a/apps/presentationeditor/main/app/view/DocumentPreview.js +++ b/apps/presentationeditor/main/app/view/DocumentPreview.js @@ -142,7 +142,6 @@ define([ iconCls: 'toolbar__icon btn-pen-tool', onlyIcon: true, stopPropagation: true, - takeFocusOnClose: true, hint: this.txtDraw, hintAnchor: 'top', hintContainer: '#pe-preview', @@ -244,8 +243,9 @@ define([ hintAnchor: 'top', hintContainer: '#pe-preview' }); - this.btnPrev.on('click', _.bind(function() { + this.btnPrev.on('click', _.bind(function(btn) { if (this.api) this.api.DemonstrationPrevSlide(); + btn.cmpEl && btn.cmpEl.blur(); this.editComplete(); }, this)); @@ -255,8 +255,9 @@ define([ hintAnchor: 'top', hintContainer: '#pe-preview' }); - this.btnNext.on('click', _.bind(function() { + this.btnNext.on('click', _.bind(function(btn) { if (this.api) this.api.DemonstrationNextSlide(); + btn.cmpEl && btn.cmpEl.blur(); this.editComplete(); }, this)); @@ -279,6 +280,7 @@ define([ if (this.api) this.api.DemonstrationPlay (); } + btn.cmpEl && btn.cmpEl.blur(); this.editComplete(); }, this)); @@ -290,11 +292,6 @@ define([ }); this.btnClose.on('click', _.bind(function() { if (this.api) this.api.EndDemonstration(); - if (this.btnDraw) { - this.btnDraw.menu.clearAll(); - this.btnDraw.toggle(false); - this.currentDrawTool = undefined; - } }, this)); this.btnFullScreen = new Common.UI.Button({ @@ -526,6 +523,11 @@ define([ }, onEndDemonstration: function( ) { + if (this.btnDraw) { + this.btnDraw.menu.clearAll(); + this.btnDraw.toggle(false); + this.currentDrawTool = undefined; + } this.hide(); Common.Utils.cancelFullscreen(); }, @@ -553,11 +555,7 @@ define([ }, editComplete: function() { - var me = this; - setTimeout(function() { - $(me.el).focus(); - me.api && me.api.asc_enableKeyEvents(true); - }, 10); + this.api && this.api.asc_enableKeyEvents(true); }, txtDraw: 'Draw',