Remove layer deletion by timer in MainWindow.

It could be: schedule deletion -> show new box -> delete it by timer.
This fixes the error box display when adding users to groups.
This commit is contained in:
John Preston 2017-07-13 19:13:10 +03:00
parent bd1547cd5e
commit 3db913f15b
2 changed files with 5 additions and 9 deletions

View File

@ -533,13 +533,6 @@ void MainWindow::checkHistoryActivation() {
}
}
void MainWindow::layerHidden() {
destroyLayerDelayed();
hideMediaview();
setInnerFocus();
checkHistoryActivation();
}
bool MainWindow::contentOverlapped(const QRect &globalRect) {
if (_main && _main->contentOverlapped(globalRect)) return true;
if (_layerBg && _layerBg->contentOverlapped(globalRect)) return true;
@ -739,7 +732,11 @@ void MainWindow::noLayerStack(LayerStackWidget *was) {
void MainWindow::layerFinishedHide(LayerStackWidget *was) {
if (was == _layerBg) {
QTimer::singleShot(0, this, SLOT(layerHidden()));
destroyLayerDelayed();
InvokeQueued(this, [this] {
setInnerFocus();
checkHistoryActivation();
});
}
}

View File

@ -152,7 +152,6 @@ protected:
public slots:
void showSettings();
void layerHidden();
void setInnerFocus();
void updateConnectingStatus();