r18231 by jghali - #11485: Popup windows misbehave in Unity

[scribus-commit]

Author: jghali
Date: Sun Apr  7 16:47:16 2013
New Revision: 18231

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18231
Log:
#11485: Popup windows misbehave in Unity

Modified:
    branches/Version14x/Scribus/scribus/storyeditor.cpp

Modified: branches/Version14x/Scribus/scribus/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18231&path=/branches/Version14x/Scribus/scribus/storyeditor.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/storyeditor.cpp (original)
+++ branches/Version14x/Scribus/scribus/storyeditor.cpp Sun Apr  7 16:47:16 2013
@@ -126,8 +126,10 @@
 	CurrentPar = editor->StyledText.nrOfParagraph(p);
 	int pos = editor->StyledText.startOfParagraph( editor->StyledText.nrOfParagraph(p) );
 
+	pmen->clear();
+
 	QString styleName = "";
-	ParaStyleComboBox* paraStyleCombo = new ParaStyleComboBox(this);
+	ParaStyleComboBox* paraStyleCombo = new ParaStyleComboBox(pmen);
 	paraStyleCombo->setDoc(editor->doc);
 	if ((CurrentPar < static_cast<int>(editor->StyledText.nrOfParagraphs())) && (editor->StyledText.length() != 0))
 	{
@@ -137,11 +139,10 @@
 	}
 	paraStyleCombo->setFormat(styleName);
 	connect(paraStyleCombo, SIGNAL(newStyle(const QString&)), this, SLOT(setPStyle(const QString&)));
-	pmen->clear();
-	paraStyleAct = new QWidgetAction(this);
+	
+	paraStyleAct = new QWidgetAction(pmen);
 	paraStyleAct->setDefaultWidget(paraStyleCombo);
 	pmen->addAction(paraStyleAct);
-	//pmen->addAction( tr("Edit Styles..."), this, SLOT(editStyles()));
 	pmen->exec(QCursor::pos());
 }