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

[PE] Added auto width change in Animation and Transition components

Browse source
This commit is contained in:
Alexei Koshelev 2022-09-19 01:23:25 +03:00
parent 0841aa0e5f
commit 9d61b0a2d8
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/combo-dataview.less
View file

@ -406,7 +406,7 @@
.view { .view {
margin-right: -@combo-dataview-button-width; margin-right: -@combo-dataview-button-width;
padding-right: @combo-dataview-button-width; padding-right: calc(@combo-dataview-button-width - @scaled-one-px-value);
} }
.view .dataview, .dropdown-menu { .view .dataview, .dropdown-menu {

4
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -153,7 +153,7 @@
</div> </div>
</section> </section>
<section id="transitions-panel" class="panel" data-tab="transit"> <section id="transitions-panel" class="panel" data-tab="transit">
<div class="group flex small" id="transit-field-effects" style="width: 900px; max-width: 900px; min-width: 120px;" data-group-width="900px"></div> <div class="group flex small" id="transit-field-effects" style="width: 855px; max-width: 855px; min-width: 120px;" data-group-width="855px"></div>
<div class="group small"> <div class="group small">
<span class="btn-slot text x-huge" id="transit-button-parameters"></span> <span class="btn-slot text x-huge" id="transit-button-parameters"></span>
@ -189,7 +189,7 @@
</div> </div>
</section> </section>
<section id="animation-panel" class="panel" data-tab="animate"> <section id="animation-panel" class="panel" data-tab="animate">
<div class="group flex small" id="animation-field-effects" style="width: 700px; max-width: 700px; min-width: 220px;" data-group-width="700px"></div> <div class="group flex small" id="animation-field-effects" style="width: 672px; max-width: 672px; min-width: 220px;" data-group-width="672px"></div>
<div class="group small"> <div class="group small">
<span class="btn-slot text x-huge" id="animation-button-parameters"></span> <span class="btn-slot text x-huge" id="animation-button-parameters"></span>
</div> </div>

3
apps/presentationeditor/main/app/view/Animation.js
View file

@ -203,7 +203,7 @@ define([
cls: 'combo-transitions combo-animation', cls: 'combo-transitions combo-animation',
itemWidth: itemWidth, itemWidth: itemWidth,
itemHeight: itemHeight, itemHeight: itemHeight,
style: 'min-width:210px;', style: 'min-width:201px;',
itemTemplate: _.template([ itemTemplate: _.template([
'<div class = "btn_item x-huge" id = "<%= id %>" style = "width: ' + itemWidth + 'px;height: ' + itemHeight + 'px;">', '<div class = "btn_item x-huge" id = "<%= id %>" style = "width: ' + itemWidth + 'px;height: ' + itemHeight + 'px;">',
'<div class = "icon toolbar__icon <%= iconCls %>"></div>', '<div class = "icon toolbar__icon <%= iconCls %>"></div>',
@ -219,6 +219,7 @@ define([
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: '-16, 0', dataHintOffset: '-16, 0',
delayRenderTips: true, delayRenderTips: true,
autoWidth: true,
beforeOpenHandler: function (e) { beforeOpenHandler: function (e) {
var cmp = this, var cmp = this,
menu = cmp.openButton.menu; menu = cmp.openButton.menu;

3
apps/presentationeditor/main/app/view/Transitions.js
View file

@ -142,7 +142,7 @@ define([
cls: 'combo-transitions', cls: 'combo-transitions',
itemWidth: itemWidth, itemWidth: itemWidth,
itemHeight: itemHeight, itemHeight: itemHeight,
style: 'min-width:110px;', style: 'min-width:108px;',
itemTemplate: _.template([ itemTemplate: _.template([
'<div class = "btn_item x-huge" id = "<%= id %>" style = "width: ' + itemWidth + 'px;height: ' + itemHeight + 'px;">', '<div class = "btn_item x-huge" id = "<%= id %>" style = "width: ' + itemWidth + 'px;height: ' + itemHeight + 'px;">',
'<div class = "icon toolbar__icon <%= imageUrl %>"></div>', '<div class = "icon toolbar__icon <%= imageUrl %>"></div>',
@ -155,6 +155,7 @@ define([
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: '-16, 0', dataHintOffset: '-16, 0',
delayRenderTips: true, delayRenderTips: true,
autoWidth: true,
beforeOpenHandler: function (e) { beforeOpenHandler: function (e) {
var cmp = this, var cmp = this,
menu = cmp.openButton.menu; menu = cmp.openButton.menu;