[rkward-cvs] [rkward] rkward/misc: Better activation procedure (makes plugin windows appear in front of app window, instead of vice-versa)

[Thomas Friedrichsmeier]

Git commit c24e7b67436cb20d425b59314209927d3ca0b63d by Thomas Friedrichsmeier.
Committed on 21/11/2014 at 16:21.
Pushed by tfry into branch 'master'.

Better activation procedure (makes plugin windows appear in front of app window, instead of vice-versa)

M  +7    -6    rkward/misc/rkdbusapi.cpp

http://commits.kde.org/rkward/c24e7b67436cb20d425b59314209927d3ca0b63d

diff --git a/rkward/misc/rkdbusapi.cpp b/rkward/misc/rkdbusapi.cpp
index 3ab397e..9367a4a 100644
--- a/rkward/misc/rkdbusapi.cpp
+++ b/rkward/misc/rkdbusapi.cpp
@@ -43,12 +43,6 @@ RKDBusAPI::RKDBusAPI (QObject* parent): QObject (parent) {
 void RKDBusAPI::openAnyUrl(const QStringList& urls) {
 	RK_TRACE (APP);
 
-	RKWardMainWindow::getMain ()->setMergeLoads (true);
-	for (int i = 0; i < urls.size (); ++i) {
-		RKWorkplace::mainWorkplace ()->openAnyUrl (urls[i]);
-	}
-	RKWardMainWindow::getMain ()->setMergeLoads (false);
-
 	// ok, raising the app window is totally hard to do, reliably. This solution copied from kate.
 	QWidget *main = RKWardMainWindow::getMain ();
 	main->show();
@@ -59,6 +53,13 @@ void RKDBusAPI::openAnyUrl(const QStringList& urls) {
 	KWindowSystem::raiseWindow (main->winId ());
 	KWindowSystem::demandAttention (main->winId ());
 #endif
+	// end
+
+	RKWardMainWindow::getMain ()->setMergeLoads (true);
+	for (int i = 0; i < urls.size (); ++i) {
+		RKWorkplace::mainWorkplace ()->openAnyUrl (urls[i]);
+	}
+	RKWardMainWindow::getMain ()->setMergeLoads (false);
 }
 
 #include "rkdbusapi.moc"