r17776 by jghali - - #10971 (again): Title of palettes is duplicated

[scribus-commit]

Author: jghali
Date: Sun Sep 23 01:40:56 2012
New Revision: 17776

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17776
Log:
- #10971 (again): Title of palettes is duplicated
- fix redraw issues when docking palettes on windows

Modified:
    trunk/Scribus/scribus/ui/scdockpalette.cpp

Modified: trunk/Scribus/scribus/ui/scdockpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17776&path=/trunk/Scribus/scribus/ui/scdockpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.cpp Sun Sep 23 01:40:56 2012
@@ -40,9 +40,8 @@
 #include "util_icon.h"
 
 
-ScDockPalette::ScDockPalette(  QWidget * parent, const QString& prefsContext, Qt::WFlags f)
-	: QDockWidget ( parent, f | Qt::Tool  | Qt::CustomizeWindowHint
-			| Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint ),
+ScDockPalette::ScDockPalette( QWidget * parent, const QString& prefsContext, Qt::WFlags f)
+	: QDockWidget ( parent, f | Qt::Tool  | Qt::CustomizeWindowHint ),
 	palettePrefs(0),
 	prefsContextName(QString::null),
 	visibleOnStartup(false)
@@ -151,7 +150,7 @@
 	// According to Qt doc, non-spontaneous show events are sent to widgets
 	// immediately before they are shown. We want to restore geometry for those
 	// events as spontaneous events are delivered after dialog has been shown
-	if (palettePrefs && !showEvent->spontaneous())
+	if (palettePrefs && !showEvent->spontaneous() && isFloating())
 	{
 		QDesktopWidget *d = QApplication::desktop();
 		QSize gStrut = QApplication::globalStrut();