mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Improve grouped files layout in chat.

Browse Source
This commit is contained in:
John Preston
2020-10-19 18:37:59 +03:00
parent 012ebdd15e
commit 263d6a30f2
26 changed files with 343 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/window/themes/window_theme_preview.cpp
View File

@@ -245,12 +245,13 @@ void Generator::addAudioBubble(QVector<int> waveform, int waveactive, QString wa
auto width = st::msgFileMinWidth;
auto tleft = 0, tright = 0;
tleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
tright = st::msgFileThumbPadding.left();
const auto &st = st::msgFileLayout;
tleft = st.padding.left() + st.thumbSize + st.padding.right();
tright = st.padding.left();
accumulate_max(width, tleft + st::normalFont->width(wavestatus) + skipBlock.width() + st::msgPadding.right());
accumulate_min(width, st::msgMaxWidth);
auto height = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
auto height = st.padding.top() + st.thumbSize + st.padding.bottom();
addBubble(std::move(bubble), width, height, date, status);
}
@@ -763,13 +764,14 @@ void Generator::paintBubble(const Bubble &bubble) {
_p->setFont(st::msgFont);
bubble.text.draw(*_p, trect.x(), trect.y(), trect.width());
} else if (!bubble.waveform.isEmpty()) {
auto nameleft = x + st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
auto nametop = y + st::msgFileNameTop;
auto nameright = st::msgFilePadding.left();
auto statustop = y + st::msgFileStatusTop;
auto bottom = y + st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
const auto &st = st::msgFileLayout;
auto nameleft = x + st.padding.left() + st.thumbSize + st.padding.right();
auto nametop = y + st.nameTop;
auto nameright = st.padding.left();
auto statustop = y + st.statusTop;
auto bottom = y + st.padding.top() + st.thumbSize + st.padding.bottom();
auto inner = style::rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize, st::msgFileSize, _rect.width());
auto inner = style::rtlrect(x + st.padding.left(), y + st.padding.top(), st.thumbSize, st.thumbSize, _rect.width());
_p->setPen(Qt::NoPen);
_p->setBrush(bubble.outbg ? st::msgFileOutBg[_palette] : st::msgFileInBg[_palette]);
@@ -790,7 +792,7 @@ void Generator::paintBubble(const Bubble &bubble) {
auto bar_count = qMin(availw / (st::msgWaveformBar + st::msgWaveformSkip), wf_size);
auto max_value = 0;
auto max_delta = st::msgWaveformMax - st::msgWaveformMin;
auto wave_bottom = y + st::msgFilePadding.top() + st::msgWaveformMax;
auto wave_bottom = y + st::msgFileLayout.padding.top() + st::msgWaveformMax;
_p->setPen(Qt::NoPen);
auto norm_value = uchar(31);
for (auto i = 0, bar_x = 0, sum_i = 0; i < wf_size; ++i) {