From 0b4d0b83c2edb36ef2617a44f5d946e8c3893bfc Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 3 Feb 2021 06:31:11 +0300 Subject: [PATCH] Removed App::wnd from classes that have pointer to Window::Controller. --- .../SourceFiles/boxes/sticker_set_box.cpp | 16 ++++----- .../chat_helpers/field_autocomplete.cpp | 18 ++++------ .../chat_helpers/gifs_list_widget.cpp | 36 +++++++++---------- .../chat_helpers/stickers_list_widget.cpp | 14 ++++---- .../dialogs/dialogs_inner_widget.cpp | 2 +- .../SourceFiles/dialogs/dialogs_widget.cpp | 8 +++-- .../admin_log/history_admin_log_inner.cpp | 2 +- .../history/history_inner_widget.cpp | 2 +- .../SourceFiles/history/history_widget.cpp | 10 +++--- .../history/view/history_view_list_widget.cpp | 2 +- .../inline_bots/inline_results_inner.cpp | 30 ++++++++-------- .../window/themes/window_theme_editor.cpp | 10 +++--- 12 files changed, 71 insertions(+), 79 deletions(-) diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp index b4eafa1025..381b5aad99 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp +++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp @@ -473,11 +473,9 @@ void StickerSetBox::Inner::mouseMoveEvent(QMouseEvent *e) { int index = stickerFromGlobalPos(e->globalPos()); if (index >= 0 && index < _pack.size() && index != _previewShown) { _previewShown = index; - if (const auto w = App::wnd()) { - w->showMediaPreview( - Data::FileOriginStickerSet(_setId, _setAccess), - _pack[_previewShown]); - } + _controller->widget()->showMediaPreview( + Data::FileOriginStickerSet(_setId, _setAccess), + _pack[_previewShown]); } } } @@ -536,11 +534,9 @@ void StickerSetBox::Inner::showPreview() { int index = stickerFromGlobalPos(QCursor::pos()); if (index >= 0 && index < _pack.size()) { _previewShown = index; - if (const auto w = App::wnd()) { - w->showMediaPreview( - Data::FileOriginStickerSet(_setId, _setAccess), - _pack[_previewShown]); - } + _controller->widget()->showMediaPreview( + Data::FileOriginStickerSet(_setId, _setAccess), + _pack[_previewShown]); } } diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp index 87ee66884e..e771b2ef3f 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp @@ -1280,11 +1280,9 @@ void FieldAutocomplete::Inner::selectByMouse(QPoint globalPosition) { if (_down >= 0 && _sel >= 0 && _down != _sel) { _down = _sel; if (_down >= 0 && _down < _srows->size()) { - if (const auto w = App::wnd()) { - w->showMediaPreview( - (*_srows)[_down].document->stickerSetOrigin(), - (*_srows)[_down].document); - } + _controller->widget()->showMediaPreview( + (*_srows)[_down].document->stickerSetOrigin(), + (*_srows)[_down].document); } } } @@ -1302,12 +1300,10 @@ void FieldAutocomplete::Inner::onParentGeometryChanged() { void FieldAutocomplete::Inner::showPreview() { if (_down >= 0 && _down < _srows->size()) { - if (const auto w = App::wnd()) { - w->showMediaPreview( - (*_srows)[_down].document->stickerSetOrigin(), - (*_srows)[_down].document); - _previewShown = true; - } + _controller->widget()->showMediaPreview( + (*_srows)[_down].document->stickerSetOrigin(), + (*_srows)[_down].document); + _previewShown = true; } } diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp index c00104e210..39b9cb6366 100644 --- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp @@ -1078,16 +1078,14 @@ void GifsListWidget::updateSelected() { _pressed = _selected; if (row >= 0 && col >= 0) { auto layout = _rows[row].items[col]; - if (const auto w = App::wnd()) { - if (const auto previewDocument = layout->getPreviewDocument()) { - w->showMediaPreview( - Data::FileOriginSavedGifs(), - previewDocument); - } else if (const auto previewPhoto = layout->getPreviewPhoto()) { - w->showMediaPreview( - Data::FileOrigin(), - previewPhoto); - } + if (const auto previewDocument = layout->getPreviewDocument()) { + controller()->widget()->showMediaPreview( + Data::FileOriginSavedGifs(), + previewDocument); + } else if (const auto previewPhoto = layout->getPreviewPhoto()) { + controller()->widget()->showMediaPreview( + Data::FileOrigin(), + previewPhoto); } } } @@ -1104,16 +1102,14 @@ void GifsListWidget::showPreview() { int row = _pressed / MatrixRowShift, col = _pressed % MatrixRowShift; if (row < _rows.size() && col < _rows[row].items.size()) { auto layout = _rows[row].items[col]; - if (const auto w = App::wnd()) { - if (const auto previewDocument = layout->getPreviewDocument()) { - _previewShown = w->showMediaPreview( - Data::FileOriginSavedGifs(), - previewDocument); - } else if (const auto previewPhoto = layout->getPreviewPhoto()) { - _previewShown = w->showMediaPreview( - Data::FileOrigin(), - previewPhoto); - } + if (const auto previewDocument = layout->getPreviewDocument()) { + _previewShown = controller()->widget()->showMediaPreview( + Data::FileOriginSavedGifs(), + previewDocument); + } else if (const auto previewPhoto = layout->getPreviewPhoto()) { + _previewShown = controller()->widget()->showMediaPreview( + Data::FileOrigin(), + previewPhoto); } } } diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 8a92680ada..a53206cde3 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -2883,9 +2883,9 @@ void StickersListWidget::setSelected(OverState newSelected) { const auto &set = sets[sticker->section]; Assert(sticker->index >= 0 && sticker->index < set.stickers.size()); const auto document = set.stickers[sticker->index].document; - if (const auto w = App::wnd()) { - w->showMediaPreview(document->stickerSetOrigin(), document); - } + controller()->widget()->showMediaPreview( + document->stickerSetOrigin(), + document); } } } @@ -2898,10 +2898,10 @@ void StickersListWidget::showPreview() { const auto &set = sets[sticker->section]; Assert(sticker->index >= 0 && sticker->index < set.stickers.size()); const auto document = set.stickers[sticker->index].document; - if (const auto w = App::wnd()) { - w->showMediaPreview(document->stickerSetOrigin(), document); - _previewShown = true; - } + controller()->widget()->showMediaPreview( + document->stickerSetOrigin(), + document); + _previewShown = true; } } diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index 31596585dc..38c1daaa0f 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -414,7 +414,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) { Painter p(this); const auto r = e->rect(); - if (App::wnd()->contentOverlapped(this, r)) { + if (_controller->widget()->contentOverlapped(this, r)) { return; } const auto activeEntry = _controller->activeChatEntryCurrent(); diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index 508e325aad..379c5341fb 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -711,7 +711,7 @@ void Widget::animationCallback() { updateControlsVisibility(true); if (!_filter->hasFocus()) { - if (App::wnd()) App::wnd()->setInnerFocus(); + controller()->widget()->setInnerFocus(); } } } @@ -957,7 +957,7 @@ void Widget::onChooseByDrag() { } void Widget::showMainMenu() { - App::wnd()->showMainMenu(); + controller()->widget()->showMainMenu(); } void Widget::searchMessages( @@ -1704,7 +1704,9 @@ void Widget::keyPressEvent(QKeyEvent *e) { } void Widget::paintEvent(QPaintEvent *e) { - if (App::wnd() && App::wnd()->contentOverlapped(this, e)) return; + if (controller()->widget()->contentOverlapped(this, e)) { + return; + } Painter p(this); QRect r(e->rect()); diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp index bc26d4a182..0df9876625 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp @@ -1515,7 +1515,7 @@ void InnerWidget::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton but if (_selectedItem && !_pressWasInactive) { if (_selectedText.from == _selectedText.to) { _selectedItem = nullptr; - App::wnd()->setInnerFocus(); + _controller->widget()->setInnerFocus(); } } } diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index 93ef222363..704d5d95d6 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -1392,7 +1392,7 @@ void HistoryInner::mouseActionFinish( auto sel = _selected.cbegin()->second; if (sel != FullSelection && sel.from == sel.to) { _selected.clear(); - App::wnd()->setInnerFocus(); + _controller->widget()->setInnerFocus(); } } } diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 8cad61a245..130041ebb2 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -260,9 +260,11 @@ HistoryWidget::HistoryWidget( connect(_field, &Ui::InputField::changed, [=] { fieldChanged(); }); - connect(App::wnd()->windowHandle(), &QWindow::visibleChanged, this, [=] { - windowIsVisibleChanged(); - }); + connect( + controller->widget()->windowHandle(), + &QWindow::visibleChanged, + this, + [=] { windowIsVisibleChanged(); }); initTabbedSelector(); @@ -2006,7 +2008,7 @@ void HistoryWidget::showHistory( update(); controller()->floatPlayerAreaUpdated(); - crl::on_main(App::wnd(), [] { App::wnd()->setInnerFocus(); }); + crl::on_main(this, [=] { controller()->widget()->setInnerFocus(); }); } void HistoryWidget::clearDelayedShowAt() { diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp index 45048eeb3f..08c77e2ae7 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp @@ -2254,7 +2254,7 @@ void ListWidget::mouseActionFinish( } else if (_selectedTextItem && !_pressWasInactive) { if (_selectedTextRange.from == _selectedTextRange.to) { clearTextSelection(); - App::wnd()->setInnerFocus(); + _controller->widget()->setInnerFocus(); } } } diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp index e44caf6fe8..9c837b05ef 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp @@ -713,14 +713,14 @@ void Inner::updateSelected() { _pressed = _selected; if (row >= 0 && col >= 0) { auto layout = _rows.at(row).items.at(col); - if (const auto w = App::wnd()) { - if (const auto previewDocument = layout->getPreviewDocument()) { - w->showMediaPreview( - Data::FileOrigin(), - previewDocument); - } else if (auto previewPhoto = layout->getPreviewPhoto()) { - w->showMediaPreview(Data::FileOrigin(), previewPhoto); - } + if (const auto previewDocument = layout->getPreviewDocument()) { + _controller->widget()->showMediaPreview( + Data::FileOrigin(), + previewDocument); + } else if (auto previewPhoto = layout->getPreviewPhoto()) { + _controller->widget()->showMediaPreview( + Data::FileOrigin(), + previewPhoto); } } } @@ -740,12 +740,14 @@ void Inner::showPreview() { int row = _pressed / MatrixRowShift, col = _pressed % MatrixRowShift; if (row < _rows.size() && col < _rows.at(row).items.size()) { auto layout = _rows.at(row).items.at(col); - if (const auto w = App::wnd()) { - if (const auto previewDocument = layout->getPreviewDocument()) { - _previewShown = w->showMediaPreview(Data::FileOrigin(), previewDocument); - } else if (const auto previewPhoto = layout->getPreviewPhoto()) { - _previewShown = w->showMediaPreview(Data::FileOrigin(), previewPhoto); - } + if (const auto previewDocument = layout->getPreviewDocument()) { + _previewShown = _controller->widget()->showMediaPreview( + Data::FileOrigin(), + previewDocument); + } else if (const auto previewPhoto = layout->getPreviewPhoto()) { + _previewShown = _controller->widget()->showMediaPreview( + Data::FileOrigin(), + previewPhoto); } } } diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp index 58fe1adade..c1802bd6ce 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp @@ -858,8 +858,8 @@ void Editor::keyPressEvent(QKeyEvent *e) { if (e->key() == Qt::Key_Escape) { if (!_select->getQuery().isEmpty()) { _select->clearQuery(); - } else if (auto window = App::wnd()) { - window->setInnerFocus(); + } else { + _window->widget()->setInnerFocus(); } } else if (e->key() == Qt::Key_Down) { _inner->selectSkip(1); @@ -904,10 +904,8 @@ void Editor::closeWithConfirmation() { } void Editor::closeEditor() { - if (const auto window = App::wnd()) { - window->showRightColumn(nullptr); - Background()->clearEditingTheme(); - } + _window->widget()->showRightColumn(nullptr); + Background()->clearEditingTheme(); } } // namespace Theme