pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: fix horizontal scrollbar of emoji popover on windows

Browse Source 
On windows, displayed emojis are bigger than the expected size
This commit removes the horizontal scrolbar that would appear
on Windows

Task-2991415

closes odoo/odoo#101347

X-original-commit: 578157fbbae92afa1581193df9173fd085fd9f09
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
This commit is contained in:
Nemael
2022-09-28 11:14:17 +02:00
parent ed024f741a
commit 81ed7cb4ca
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/components/emoji_grid_view/emoji_grid_view.scss
+1 -1
View File
@@ -6,7 +6,7 @@
height: auto;
width: auto;
overflow-y: scroll;
overflow-x: visible;
overflow-x: hidden;
}
.o_EmojiGridView_list {
addons/mail/static/src/components/emoji_grid_view/emoji_grid_view.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<templates xml:space="preserve">
<t t-name="mail.EmojiGridView" owl="1">
<div class="o_EmojiGridView o_EmojiGridView_container" t-attf-style="--rowHeight: {{emojiGridView.rowHeight}}px; --itemWidth: {{emojiGridView.itemWidth}}px; height: {{emojiGridView.height}}; width: {{emojiGridView.width}};" t-on-scroll="emojiGridView.onScroll" t-ref="containerRef">
<div class="o_EmojiGridView o_EmojiGridView_container" t-attf-style="--rowHeight: {{emojiGridView.rowHeight}}px; --itemWidth: {{emojiGridView.itemWidth}}px; height: {{emojiGridView.height}}px; width: {{emojiGridView.width}}px;" t-on-scroll="emojiGridView.onScroll" t-ref="containerRef">
<EmojiGridSearchNoContentView t-if="emojiGridView.searchNoContentView" record="emojiGridView.searchNoContentView"/>
<div t-if="!emojiGridView.searchNoContentView" class="o_EmojiGridView_list" t-attf-style="height: {{emojiGridView.listHeight}}px; min-height: {{emojiGridView.listHeight}}px;" t-ref="listRef">
<div t-if="emojiGridView.lastRenderedRowIndex >= emojiGridView.firstRenderedRowIndex" class="o_EmojiGridView_viewBlock" t-attf-style="top: {{ emojiGridView.distanceFromTop - emojiGridView.distanceInRowOffset }}px; width: {{ emojiGridView.width }};" t-ref="viewBlockRef">
<div t-if="emojiGridView.lastRenderedRowIndex >= emojiGridView.firstRenderedRowIndex" class="o_EmojiGridView_viewBlock" t-attf-style="top: {{ emojiGridView.distanceFromTop - emojiGridView.distanceInRowOffset }}px; width: {{ emojiGridView.width }}px;" t-ref="viewBlockRef">
<EmojiGridRowView t-foreach="emojiGridView.renderedRows" t-as="row" t-key="row" record="row"/>
</div>
</div>
addons/mail/static/src/models/emoji_grid_view.js
+4 -2
View File
@@ -109,7 +109,9 @@ registerModel({
default: 0,
}),
height: attr({
default: "275px",
compute() {
return this.rowHeight * 9.5;
},
}),
itemWidth: attr({
default: 30,
@@ -210,7 +212,7 @@ registerModel({
viewBlockRef: attr(),
width: attr({
compute() {
return `${this.itemWidth * this.amountOfItemsPerRow + this.scrollbarThresholdWidth}px`;
return this.itemWidth * this.amountOfItemsPerRow + this.scrollbarThresholdWidth;
},
}),
},