mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 06:54:43 +00:00
Merge tag 'v5.3.2' into dev
# Conflicts: # .github/workflows/mac_packaged.yml # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/boxes/sticker_set_box.cpp # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp # Telegram/lib_ui # snap/snapcraft.yaml
This commit is contained in:
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include "window/section_widget.h"
|
||||
|
||||
#include "mainwidget.h"
|
||||
#include "mainwindow.h"
|
||||
#include "ui/ui_utility.h"
|
||||
#include "ui/chat/chat_theme.h"
|
||||
#include "ui/painter.h"
|
||||
@@ -460,7 +461,11 @@ void SectionWidget::showFinished() {
|
||||
showChildren();
|
||||
showFinishedHook();
|
||||
|
||||
setInnerFocus();
|
||||
if (isAncestorOf(window()->focusWidget())) {
|
||||
setInnerFocus();
|
||||
} else {
|
||||
controller()->widget()->setInnerFocus();
|
||||
}
|
||||
}
|
||||
|
||||
rpl::producer<int> SectionWidget::desiredHeight() const {
|
||||
|
||||
Reference in New Issue
Block a user