diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-05-16 15:31:48 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-05-16 15:31:48 +0000 |
| commit | f56054da303df23a584504d9cfebee2c92bbc3ab (patch) | |
| tree | e042b5d34f05c106f8b50683cb41c07acfd3e7ec /src/ui/playlist.cpp | |
| parent | 49ba6c2fa06151f4c80b847d5be20185e3896ac8 (diff) | |
| download | qmmp-f56054da303df23a584504d9cfebee2c92bbc3ab.tar.gz qmmp-f56054da303df23a584504d9cfebee2c92bbc3ab.tar.bz2 qmmp-f56054da303df23a584504d9cfebee2c92bbc3ab.zip | |
fixed regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1738 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/ui/playlist.cpp')
| -rw-r--r-- | src/ui/playlist.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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 |