void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: better UI

Browse source
This commit is contained in:
ZavaruKitsu 2023-12-24 21:12:17 +03:00
parent e079a69d7e
commit 032de55103
4 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/dialogs/dialogs.style
View file

@ -98,9 +98,9 @@ forumDialogJumpArrowPosition: point(3px, 3px);
forumDialogJumpPadding: margins(8px, 3px, 8px, 3px); forumDialogJumpPadding: margins(8px, 3px, 8px, 3px);
forumDialogJumpRadius: 11px; forumDialogJumpRadius: 11px;
dialogsOnlineBadgeStroke: 2px; dialogsOnlineBadgeStroke: 3px;
dialogsOnlineBadgeSize: 10px; dialogsOnlineBadgeSize: 12px;
dialogsOnlineBadgeSkip: point(0px, 2px); dialogsOnlineBadgeSkip: point(0px, 0px);
dialogsOnlineBadgeDuration: 150; dialogsOnlineBadgeDuration: 150;
dialogsCallBadgeSize: 16px; dialogsCallBadgeSize: 16px;

4
Telegram/SourceFiles/history/view/history_view_message.cpp
View file

@ -3260,9 +3260,7 @@ bool Message::unwrapped() const {
return false; return false;
} }
const auto media = this->media(); const auto media = this->media();
return media return media == nullptr && item->isEmpty();
? (!hasVisibleText() && media->unwrapped())
: item->isEmpty();
} }
int Message::minWidthForMedia() const { int Message::minWidthForMedia() const {

22
Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
View file

@ -34,6 +34,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "chat_helpers/stickers_lottie.h" #include "chat_helpers/stickers_lottie.h"
#include "styles/style_chat.h" #include "styles/style_chat.h"
// AyuGram includes
#include "history/view/media/history_view_media.h"
#include "ui/chat/message_bubble.h"
namespace HistoryView { namespace HistoryView {
namespace { namespace {
@ -271,11 +276,19 @@ void Sticker::paintAnimationFrame(
const auto &image = _lastDiceFrame.isNull() const auto &image = _lastDiceFrame.isNull()
? frame.image ? frame.image
: _lastDiceFrame; : _lastDiceFrame;
const auto prepared = (!_lastDiceFrame.isNull() && context.selected())
const auto rounding = Ui::BubbleRounding{
.topLeft = Ui::BubbleCornerRounding::Small,
.topRight = Ui::BubbleCornerRounding::Small,
.bottomLeft = Ui::BubbleCornerRounding::Small,
.bottomRight = Ui::BubbleCornerRounding::Small,
};
auto prepared = (!_lastDiceFrame.isNull() && context.selected())
? Images::Colored( ? Images::Colored(
base::duplicate(image), base::duplicate(image),
context.st->msgStickerOverlay()->c) context.st->msgStickerOverlay()->c)
: image; : image;
prepared = Images::Round(std::move(prepared), MediaRoundingMask(rounding));
const auto size = prepared.size() / cIntRetinaFactor(); const auto size = prepared.size() / cIntRetinaFactor();
p.drawImage( p.drawImage(
QRect( QRect(
@ -373,6 +386,7 @@ void Sticker::paintPath(
} }
QPixmap Sticker::paintedPixmap(const PaintContext &context) const { QPixmap Sticker::paintedPixmap(const PaintContext &context) const {
const auto roundOptions = Images::RoundOptions(ImageRoundRadius::Large);
auto helper = std::optional<style::owned_color>(); auto helper = std::optional<style::owned_color>();
const auto colored = (customEmojiPart() && _data->emojiUsesTextColor()) const auto colored = (customEmojiPart() && _data->emojiUsesTextColor())
? &helper.emplace(ComputeEmojiTextColor(context)).color() ? &helper.emplace(ComputeEmojiTextColor(context)).color()
@ -381,7 +395,7 @@ QPixmap Sticker::paintedPixmap(const PaintContext &context) const {
: nullptr; : nullptr;
const auto good = _dataMedia->goodThumbnail(); const auto good = _dataMedia->goodThumbnail();
if (const auto image = _dataMedia->getStickerLarge()) { if (const auto image = _dataMedia->getStickerLarge()) {
return image->pix(_size, { .colored = colored }); return image->pix(_size, { .colored = colored, .options = roundOptions });
// //
// Inline thumbnails can't have alpha channel. // Inline thumbnails can't have alpha channel.
// //
@ -390,11 +404,11 @@ QPixmap Sticker::paintedPixmap(const PaintContext &context) const {
// _size, // _size,
// { .colored = colored, .options = Images::Option::Blur }); // { .colored = colored, .options = Images::Option::Blur });
} else if (good) { } else if (good) {
return good->pix(_size, { .colored = colored }); return good->pix(_size, { .colored = colored, .options = roundOptions });
} else if (const auto thumbnail = _dataMedia->thumbnail()) { } else if (const auto thumbnail = _dataMedia->thumbnail()) {
return thumbnail->pix( return thumbnail->pix(
_size, _size,
{ .colored = colored, .options = Images::Option::Blur }); { .colored = colored, .options = Images::Option::Blur | roundOptions });
} }
return QPixmap(); return QPixmap();
} }

19
Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
View file

@ -650,15 +650,16 @@ void Selector::finishExpand() {
} }
void Selector::paintBubble(QPainter &p, int innerWidth) { void Selector::paintBubble(QPainter &p, int innerWidth) {
const auto &bubble = _st.icons.stripBubble; // AyuGram: removed
const auto bubbleRight = std::min( // const auto &bubble = _st.icons.stripBubble;
st::reactStripBubbleRight, // const auto bubbleRight = std::min(
(innerWidth - bubble.width()) / 2); // st::reactStripBubbleRight,
bubble.paint( // (innerWidth - bubble.width()) / 2);
p, // bubble.paint(
_inner.x() + innerWidth - bubbleRight - bubble.width(), // p,
_inner.y() + _inner.height() - _collapsedTopSkip, // _inner.x() + innerWidth - bubbleRight - bubble.width(),
width()); // _inner.y() + _inner.height() - _collapsedTopSkip,
// width());
} }
void Selector::paintEvent(QPaintEvent *e) { void Selector::paintEvent(QPaintEvent *e) {