r17906 by jghali - #11153: Supposed to be activated window is not activated
scribus-commit
scribus-commit at lists.scribus.net
Sun Nov 25 12:08:25 UTC 2012
Author: jghali
Date: Sun Nov 25 12:08:25 2012
New Revision: 17906
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17906
Log:
#11153: Supposed to be activated window is not activated
Modified:
trunk/Scribus/scribus/scribus.cpp
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17906&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Nov 25 12:08:25 2012
@@ -2396,11 +2396,15 @@
}
}
-void ScribusMainWindow::windowsMenuActivated( int id )
+void ScribusMainWindow::windowsMenuActivated(int id)
{
QMdiSubWindow* windowWidget = mdiArea->subWindowList().at( id );
- if ( windowWidget )
- windowWidget->showNormal();
+ if (windowWidget)
+ {
+ if (windowWidget->isShaded() || windowWidget->isMinimized())
+ windowWidget->showNormal();
+ windowWidget->raise();
+ }
newActWin(windowWidget);
}
More information about the scribus-commit
mailing list