From 7eb404999bb9a522b260f97d624d0f6e524b1bad Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Thu, 7 Jul 2016 16:10:18 +0200 Subject: Bring background enter room dialog to front if it exists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the same approach taken by the vCard dialog. Test-Information: Previously the open 'Enter Room…' dialog would stay in background when selecting the 'Enter Room…' menu item. Now it will be raised to top. Tested on OS X 10.11.5 and Qt 5.5.1. Change-Id: I8ef78ceea328206306d25085feeb3f5b039821d9 diff --git a/Swift/QtUI/QtJoinMUCWindow.cpp b/Swift/QtUI/QtJoinMUCWindow.cpp index ec2028c..400d1bf 100644 --- a/Swift/QtUI/QtJoinMUCWindow.cpp +++ b/Swift/QtUI/QtJoinMUCWindow.cpp @@ -69,6 +69,7 @@ void QtJoinMUCWindow::setMUC(const std::string& nick) { void QtJoinMUCWindow::show() { QWidget::show(); QWidget::activateWindow(); + QWidget::raise(); ui.password->setText(""); } -- cgit v0.10.2-6-g49f6