procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow monospace blocks to extend bubble width. 

This partially fixes #2060 instead of additional settings from #7822.
This commit is contained in:
John Preston 2020-05-12 11:06:44 +04:00
parent 295aa644bf
commit 07e3671ca8
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/boxes/create_poll_box.cpp
View File

@ -83,7 +83,7 @@ private:
void show(anim::type animated); void show(anim::type animated);
void destroy(FnMut<void()> done); void destroy(FnMut<void()> done);
[[nodisacrd]] bool hasShadow() const; [[nodiscard]] bool hasShadow() const;
void createShadow(); void createShadow();
void destroyShadow(); void destroyShadow();

11
Telegram/SourceFiles/history/view/history_view_message.cpp
View File

@ -1464,6 +1464,12 @@ int Message::plainMaxWidth() const {
+ st::msgPadding.right(); + st::msgPadding.right();
} }
int Message::monospaceMaxWidth() const {
return st::msgPadding.left()
+ (hasVisibleText() ? message()->_text.countMaxMonospaceWidth() : 0)
+ st::msgPadding.right();
}
void Message::initLogEntryOriginal() { void Message::initLogEntryOriginal() {
if (const auto log = message()->Get<HistoryMessageLogEntryOriginal>()) { if (const auto log = message()->Get<HistoryMessageLogEntryOriginal>()) {
AddComponents(LogEntryOriginal::Bit()); AddComponents(LogEntryOriginal::Bit());
@ -1787,7 +1793,7 @@ QRect Message::countGeometry() const {
// contentLeft += st::msgPhotoSkip - (hmaxwidth - hwidth); // contentLeft += st::msgPhotoSkip - (hmaxwidth - hwidth);
} }
accumulate_min(contentWidth, maxWidth()); accumulate_min(contentWidth, maxWidth());
accumulate_min(contentWidth, st::msgMaxWidth); accumulate_min(contentWidth, _bubbleWidthLimit);
if (mediaWidth < contentWidth) { if (mediaWidth < contentWidth) {
const auto textualWidth = plainMaxWidth(); const auto textualWidth = plainMaxWidth();
if (mediaWidth < textualWidth if (mediaWidth < textualWidth
@ -1829,7 +1835,8 @@ int Message::resizeContentGetHeight(int newWidth) {
contentWidth -= st::msgPhotoSkip; contentWidth -= st::msgPhotoSkip;
} }
accumulate_min(contentWidth, maxWidth()); accumulate_min(contentWidth, maxWidth());
accumulate_min(contentWidth, st::msgMaxWidth); _bubbleWidthLimit = std::max(st::msgMaxWidth, monospaceMaxWidth());
accumulate_min(contentWidth, _bubbleWidthLimit);
if (mediaDisplayed) { if (mediaDisplayed) {
media->resizeGetHeight(contentWidth); media->resizeGetHeight(contentWidth);
if (media->width() < contentWidth) { if (media->width() < contentWidth) {

6
Telegram/SourceFiles/history/view/history_view_message.h
View File

@ -157,8 +157,9 @@ private:
const HistoryMessageEdited *displayedEditBadge() const; const HistoryMessageEdited *displayedEditBadge() const;
HistoryMessageEdited *displayedEditBadge(); HistoryMessageEdited *displayedEditBadge();
void initTime(); void initTime();
int timeLeft() const; [[nodiscard]] int timeLeft() const;
int plainMaxWidth() const; [[nodiscard]] int plainMaxWidth() const;
[[nodiscard]] int monospaceMaxWidth() const;
WebPage *logEntryOriginal() const; WebPage *logEntryOriginal() const;
@ -167,6 +168,7 @@ private:
mutable ClickHandlerPtr _rightActionLink; mutable ClickHandlerPtr _rightActionLink;
mutable ClickHandlerPtr _fastReplyLink; mutable ClickHandlerPtr _fastReplyLink;
int _bubbleWidthLimit = 0;
}; };

4
Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
View File

@ -37,8 +37,8 @@ public:
void process(std::vector<FFmpeg::Packet> &&packets); void process(std::vector<FFmpeg::Packet> &&packets);
[[nodisacrd]] rpl::producer<> checkNextFrame() const; [[nodiscard]] rpl::producer<> checkNextFrame() const;
[[nodisacrd]] rpl::producer<> waitingForData() const; [[nodiscard]] rpl::producer<> waitingForData() const;
void pause(crl::time time); void pause(crl::time time);
void resume(crl::time time); void resume(crl::time time);

2
Telegram/SourceFiles/window/themes/window_theme_editor.h
View File

@ -43,7 +43,7 @@ struct ParsedTheme {
const QByteArray &value); const QByteArray &value);
[[nodiscard]] QByteArray WriteCloudToText(const Data::CloudTheme &cloud); [[nodiscard]] QByteArray WriteCloudToText(const Data::CloudTheme &cloud);
[[nodiscard]] Data::CloudTheme ReadCloudFromText(const QByteArray &text); [[nodiscard]] Data::CloudTheme ReadCloudFromText(const QByteArray &text);
[[nodisacrd]] QByteArray StripCloudTextFields(const QByteArray &text); [[nodiscard]] QByteArray StripCloudTextFields(const QByteArray &text);
class Editor : public TWidget { class Editor : public TWidget {
public: public:

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit d05d9b214da0e9708ff0c5f540c6fb09f6187e7d Subproject commit b1d00d0b28cfce60d88b1a0a088539980adcfdb5