mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 22:55:11 +00:00
Code Issues Releases Wiki Activity

Improve code for Shortcuts handling.

Browse Source
This commit is contained in:
John Preston
2018-11-16 16:15:14 +04:00
parent 8a3615281c
commit b3ffbeb63e
24 changed files with 683 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Telegram/SourceFiles/mainwidget.cpp
View File

@@ -61,7 +61,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/download_path_box.h"
#include "boxes/connection_box.h"
#include "storage/localstorage.h"
#include "shortcuts.h"
#include "media/media_audio.h"
#include "media/player/media_player_panel.h"
#include "media/player/media_player_widget.h"
@@ -79,6 +78,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mtproto/dc_options.h"
#include "core/file_utilities.h"
#include "core/update_checker.h"
#include "core/shortcuts.h"
#include "calls/calls_instance.h"
#include "calls/calls_top_bar.h"
#include "export/export_settings.h"
@@ -621,24 +621,6 @@ void MainWidget::notify_historyMuteUpdated(History *history) {
_dialogs->notify_historyMuteUpdated(history);
}
bool MainWidget::cmd_search() {
if (Ui::isLayerShown() || !isActiveWindow()) return false;
if (_mainSection) {
return _mainSection->cmd_search();
}
return _history->cmd_search();
}
bool MainWidget::cmd_next_chat() {
if (Ui::isLayerShown() || !isActiveWindow()) return false;
return _history->cmd_next_chat();
}
bool MainWidget::cmd_previous_chat() {
if (Ui::isLayerShown() || !isActiveWindow()) return false;
return _history->cmd_previous_chat();
}
void MainWidget::noHider(HistoryHider *destroyed) {
if (_hider == destroyed) {
_hider = nullptr;
@@ -1208,7 +1190,7 @@ void MainWidget::closeBothPlayers() {
Media::Player::instance()->stop(AudioMsgId::Type::Voice);
Media::Player::instance()->stop(AudioMsgId::Type::Song);
Shortcuts::disableMediaShortcuts();
Shortcuts::DisableMediaShortcuts();
}
void MainWidget::createPlayer() {
@@ -1230,7 +1212,7 @@ void MainWidget::createPlayer() {
if (_a_show.animating()) {
_player->show(anim::type::instant);
_player->setVisible(false);
Shortcuts::enableMediaShortcuts();
Shortcuts::EnableMediaShortcuts();
} else {
_player->hide(anim::type::instant);
}
@@ -1240,7 +1222,7 @@ void MainWidget::createPlayer() {
_player->show(anim::type::normal);
_playerHeight = _contentScrollAddToY = _player->contentHeight();
updateControlsGeometry();
Shortcuts::enableMediaShortcuts();
Shortcuts::EnableMediaShortcuts();
}
}
}