procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Hide captions in IV slideshows.

Browse source
This commit is contained in:
John Preston 2024-03-24 14:26:24 +04:00
parent 57bd0d2674
commit f7d04d668b
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/Resources/iv_html/page.css
View file

@ -652,7 +652,7 @@ figure.slideshow .video-wrap {
bottom: 10px;
white-space: nowrap;
overflow: hidden;
z-index: 3;
z-index: 5;
}
.slideshow-buttons > fieldset {
padding: 0;

1
Telegram/Resources/iv_html/page.js
View file

@ -149,7 +149,6 @@ var IV = {
var s = form.s;
const next = +s.value + delta;
s.value = (next == s.length) ? 0 : (next == -1) ? (s.length - 1) : next;
s.forEach(function(el){ el.checked && el.parentNode.scrollIntoView && el.parentNode.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'center'}); });
form.nextSibling.firstChild.style[marginProp] = (-100 * s.value) + '%';
} else {
el.form.nextSibling.firstChild.style[marginProp] = (-100 * el.value) + '%';

22
Telegram/SourceFiles/iv/iv_prepare.cpp
View file

@ -110,13 +110,11 @@ private:
[[nodiscard]] QByteArray block(
const MTPDpageBlockPhoto &data,
const Ui::GroupMediaLayout &layout = {},
QSize outer = {},
int slideshowIndex = -1);
QSize outer = {});
[[nodiscard]] QByteArray block(
const MTPDpageBlockVideo &data,
const Ui::GroupMediaLayout &layout = {},
QSize outer = {},
int slideshowIndex = -1);
QSize outer = {});
[[nodiscard]] QByteArray block(const MTPDpageBlockCover &data);
[[nodiscard]] QByteArray block(const MTPDpageBlockEmbed &data);
[[nodiscard]] QByteArray block(const MTPDpageBlockEmbedPost &data);
@ -461,8 +459,7 @@ QByteArray Parser::block(const MTPDpageBlockPullquote &data) {
QByteArray Parser::block(
const MTPDpageBlockPhoto &data,
const Ui::GroupMediaLayout &layout,
QSize outer,
int slideshowIndex) {
QSize outer) {
const auto collage = !layout.geometry.isEmpty();
const auto slideshow = !collage && !outer.isEmpty();
const auto photo = photoById(data.vphoto_id().v);
@ -518,16 +515,19 @@ QByteArray Parser::block(
{ "href", href },
{ "oncontextmenu", data.vurl() ? QByteArray() : "return false;" },
{ "data-context", data.vurl() ? QByteArray() : "viewer-photo" + id },
}, result) + caption(data.vcaption());
}, result);
if (!slideshow) {
result += caption(data.vcaption());
}
return result;
}
QByteArray Parser::block(
const MTPDpageBlockVideo &data,
const Ui::GroupMediaLayout &layout,
QSize outer,
int slideshowIndex) {
QSize outer) {
const auto collage = !layout.geometry.isEmpty();
const auto slideshow = !collage && !outer.isEmpty();
const auto collageSmall = collage
&& (layout.geometry.width() < outer.width());
const auto video = documentById(data.vvideo_id().v);
@ -581,7 +581,9 @@ QByteArray Parser::block(
{ "data-context", "viewer-video" + id },
}, result);
}
result += caption(data.vcaption());
if (!slideshow) {
result += caption(data.vcaption());
}
return result;
}