RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed glitches in draft apply. Fixed overflow / crash in media preview. 

Fixed new unread messages with existing unread bar in the shown history.
This commit is contained in:
John Preston 2016-06-10 18:11:44 +03:00
parent 5ffc5dd218
commit b20245c8c8
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Telegram/SourceFiles/historywidget.cpp
View File

@ -3856,8 +3856,12 @@ void HistoryWidget::applyDraft(bool parseLinks) {
} }
void HistoryWidget::applyCloudDraft(History *history) { void HistoryWidget::applyCloudDraft(History *history) {
if (_history == history) { if (_history == history && !_editMsgId) {
applyDraft(); applyDraft();
updateControlsVisibility();
resizeEvent(nullptr);
update();
} }
} }
@ -4034,7 +4038,7 @@ void HistoryWidget::showHistory(const PeerId &peerId, MsgId showAtMsgId, bool re
} }
applyDraft(false); applyDraft(false);
resizeEvent(0); resizeEvent(nullptr);
if (!_previewCancelled) { if (!_previewCancelled) {
onPreviewParse(); onPreviewParse();
} }
@ -4671,8 +4675,21 @@ bool HistoryWidget::doWeReadServerHistory() const {
if (scrollBottom > _list->itemTop(showFrom)) return true; if (scrollBottom > _list->itemTop(showFrom)) return true;
} }
} }
if (_history->showFrom && !_history->showFrom->detached() && _history->unreadBar) return true; if (historyHasNotFreezedUnreadBar(_history)) {
if (_migrated && _migrated->showFrom && !_migrated->showFrom->detached() && _migrated->unreadBar) return true; return true;
}
if (historyHasNotFreezedUnreadBar(_migrated)) {
return true;
}
return false;
}
bool HistoryWidget::historyHasNotFreezedUnreadBar(History *history) const {
if (history && history->showFrom && !history->showFrom->detached() && history->unreadBar) {
if (auto unreadBar = history->unreadBar->Get<HistoryMessageUnreadBar>()) {
return !unreadBar->_freezed;
}
}
return false; return false;
} }

2
Telegram/SourceFiles/historywidget.h
View File

@ -857,6 +857,8 @@ private:
void moveFieldControls(); void moveFieldControls();
void updateFieldSize(); void updateFieldSize();
bool historyHasNotFreezedUnreadBar(History *history) const;
void clearInlineBot(); void clearInlineBot();
void inlineBotChanged(); void inlineBotChanged();

2
Telegram/SourceFiles/layerwidget.cpp
View File

@ -202,7 +202,7 @@ void MediaPreviewWidget::paintEvent(QPaintEvent *e) {
QRect r(e->rect()); QRect r(e->rect());
const QPixmap &draw(currentImage()); const QPixmap &draw(currentImage());
uint32 w = draw.width() / cIntRetinaFactor(), h = draw.height() / cIntRetinaFactor(); int w = draw.width() / cIntRetinaFactor(), h = draw.height() / cIntRetinaFactor();
if (_a_shown.animating()) { if (_a_shown.animating()) {
float64 shown = a_shown.current(); float64 shown = a_shown.current();
p.setOpacity(shown); p.setOpacity(shown);