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

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

This commit is contained in:
John Preston 2015-09-22 12:58:51 +03:00
parent 38e3399b1d db05e10f5f
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

4
README.md
View File

@ -2,7 +2,7 @@
This is the complete source code and the build instructions for the alpha version of the official desktop client for the [Telegram][telegram] messenger, based on the [Telegram API][telegram_api] and the [MTProto][telegram_proto] secure protocol. This is the complete source code and the build instructions for the alpha version of the official desktop client for the [Telegram][telegram] messenger, based on the [Telegram API][telegram_api] and the [MTProto][telegram_proto] secure protocol.
The source code is published under GPL v3, the license is available [here][license]. The source code is published under GPLv3, the license is available [here][license].
## Supported systems ## Supported systems
@ -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() {