From ed97ff0d4fd71dea6ad509b1178bb167f01bc178 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 18 Mar 2020 16:14:19 +0400 Subject: [PATCH] Don't loose focus from layer in animation. --- ui/layers/layer_widget.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp index 91df272..1dd165d 100644 --- a/ui/layers/layer_widget.cpp +++ b/ui/layers/layer_widget.cpp @@ -633,12 +633,21 @@ void LayerStackWidget::prepareForAnimation() { show(); } if (_mainMenu) { + if (Ui::InFocusChain(_mainMenu)) { + setFocus(); + } _mainMenu->hide(); } if (_specialLayer) { + if (Ui::InFocusChain(_specialLayer)) { + setFocus(); + } _specialLayer->hide(); } if (const auto layer = currentLayer()) { + if (Ui::InFocusChain(layer)) { + setFocus(); + } layer->hide(); } }