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

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop into dev

Browse source
This commit is contained in:
John Preston 2015-09-22 12:58:51 +03:00
commit 79b2035b0d
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -105,4 +105,4 @@ The source code is published under GPL v3, the license is available [here][licen
[msvc]: MSVC.md [msvc]: MSVC.md
[xcode]: XCODE.md [xcode]: XCODE.md
[xcode_old]: XCODEold.md [xcode_old]: XCODEold.md
[qtcreator]: qtcreator.md [qtcreator]: QTCREATOR.md

1
Telegram/SourceFiles/historywidget.cpp
View file

@ -3360,6 +3360,7 @@ void HistoryWidget::updateControlsVisibility() {
_cmdStart.hide(); _cmdStart.hide();
_attachType.hide(); _attachType.hide();
_emojiPan.hide(); _emojiPan.hide();
_kbScroll.hide();
if (!_field.isHidden()) { if (!_field.isHidden()) {
_field.hide(); _field.hide();
resizeEvent(0); resizeEvent(0);

2
Telegram/SourceFiles/window.cpp
View file

@ -1580,7 +1580,7 @@ void Window::notifyUpdateAllPhotos() {
(*i)->updatePeerPhoto(); (*i)->updatePeerPhoto();
} }
} }
if (_mediaView) _mediaView->updateControls(); if (_mediaView && !_mediaView->isHidden()) _mediaView->updateControls();
} }
void Window::notifyUpdateAll() { void Window::notifyUpdateAll() {