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/eqwidget.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/eqwidget.cpp')
| -rw-r--r-- | src/ui/eqwidget.cpp | 21 |
1 files changed, 10 insertions, 11 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 |