fixed regression

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1738 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 22 insertions, 21 deletions

diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp
index 790f88a84..beaee5639 100644
--- a/src/ui/eqwidget.cpp
+++ b/src/ui/eqwidget.cpp
@@ -72,6 +72,14 @@ EqWidget::EqWidget (QWidget *parent)
     updatePositions();
     updateMask();
     connect(SoundCore::instance(), SIGNAL(volumeChanged(int, int)), m_titleBar, SLOT(setVolume(int, int)));
+#ifdef Q_WS_X11
+    QString wm_name = WindowSystem::netWindowManagerName();
+    if(wm_name.contains("metacity", Qt::CaseInsensitive) ||
+       wm_name.contains("openbox", Qt::CaseInsensitive))
+        setWindowFlags (Qt::Tool | Qt::FramelessWindowHint);
+    else
+#endif
+        setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
 }
 
 EqWidget::~EqWidget()
@@ -142,15 +150,6 @@ void EqWidget::setMimimalMode(bool b)
 
 void EqWidget::readSettings()
 {
-#ifdef Q_WS_X11
-    QString wm_name = WindowSystem::netWindowManagerName();
-    if(wm_name.contains("metacity", Qt::CaseInsensitive) ||
-       wm_name.contains("openbox", Qt::CaseInsensitive))
-        setWindowFlags (Qt::Tool | Qt::FramelessWindowHint);
-    else
-#endif
-        setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
-
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup ("Equalizer");
     //geometry
@@ -448,8 +447,8 @@ void EqWidget::keyPressEvent (QKeyEvent *ke)
 #ifdef Q_WS_X11
 bool EqWidget::event (QEvent *event)
 {
-    if(event->type() == QEvent::WinIdChange || event->type() == QEvent::Show)
-        WindowSystem::ghostWindow(winId());
+    /*if(event->type() == QEvent::WinIdChange || event->type() == QEvent::Show)
+        WindowSystem::ghostWindow(winId());*/
     return QWidget::event(event);
 }
 #endif
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index b1547eb4b..a1f357808 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -304,6 +304,7 @@ void MainWindow::readSettings()
         qApp->processEvents();
         //visibility
         m_playlist->setVisible(settings.value("Playlist/visible",true).toBool());
+        qApp->processEvents();
         m_equalizer->setVisible(settings.value("Equalizer/visible",true).toBool());
         bool val = settings.value("Playlist/repeatable",false).toBool();
 
@@ -331,6 +332,7 @@ void MainWindow::readSettings()
             m_equalizer->setWindowFlags(m_equalizer->windowFlags() & ~Qt::WindowStaysOnTopHint);
         }
         show();
+        qApp->processEvents();
         m_playlist->setVisible(m_display->isPlaylistVisible());
         m_equalizer->setVisible(m_display->isEqualizerVisible());
     }
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index 60784a31f..132825e38 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -118,6 +118,14 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent)
     readSettings();
     setCursor(m_skin->getCursor(Skin::CUR_PNORMAL));
     updatePositions();
+#ifdef Q_WS_X11
+    QString wm_name = WindowSystem::netWindowManagerName();
+    if(wm_name.contains("metacity", Qt::CaseInsensitive) ||
+       wm_name.contains("openbox", Qt::CaseInsensitive))
+        setWindowFlags (Qt::Tool | Qt::FramelessWindowHint);
+    else
+#endif
+        setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
 }
 
 PlayList::~PlayList()
@@ -467,14 +475,6 @@ void PlayList::changeEvent (QEvent * event)
 
 void PlayList::readSettings()
 {
-#ifdef Q_WS_X11
-    QString wm_name = WindowSystem::netWindowManagerName();
-    if(wm_name.contains("metacity", Qt::CaseInsensitive) ||
-       wm_name.contains("openbox", Qt::CaseInsensitive))
-        setWindowFlags (Qt::Tool | Qt::FramelessWindowHint);
-    else
-#endif
-        setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     if (settings.value("PlayList/show_plalists", false).toBool())
     {
@@ -506,8 +506,8 @@ void PlayList::readSettings()
 #ifdef Q_WS_X11
 bool PlayList::event (QEvent *event)
 {
-    if(event->type() == QEvent::WinIdChange || event->type() == QEvent::Show)
-        WindowSystem::ghostWindow(winId());
+    /*if(event->type() == QEvent::WinIdChange || event->type() == QEvent::Show)
+        WindowSystem::ghostWindow(winId());*/
     return QWidget::event(event);
 }
 #endif