aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-07-30 20:37:48 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-07-30 20:37:48 +0000
commita6eba9ecc587ca34219bbd3a0995b546b12a1d0d (patch)
treeb6360c47b33a900dcb97cbc2771567848d275c31
parent0e5186349df8d9fae820e9d5c5b91a0e78a160c7 (diff)
downloadqmmp-a6eba9ecc587ca34219bbd3a0995b546b12a1d0d.tar.gz
qmmp-a6eba9ecc587ca34219bbd3a0995b546b12a1d0d.tar.bz2
qmmp-a6eba9ecc587ca34219bbd3a0995b546b12a1d0d.zip
fixed problems with openbox (closes issue 141)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1091 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/ui/eqwidget.cpp2
-rw-r--r--src/ui/mainwindow.cpp11
-rw-r--r--src/ui/playlist.cpp2
3 files changed, 9 insertions, 6 deletions
diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp
index efcef55db..21661aae0 100644
--- a/src/ui/eqwidget.cpp
+++ b/src/ui/eqwidget.cpp
@@ -43,7 +43,7 @@ EqWidget::EqWidget (QWidget *parent)
: PixmapWidget (parent)
{
m_skin = Skin::getPointer();
- setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
+ setWindowFlags (/*Qt::Dialog*/Qt::Tool | Qt::FramelessWindowHint);
setPixmap (m_skin->getEqPart (Skin::EQ_MAIN));
//setPixmap(QPixmap(275,116));
m_titleBar = new EqTitleBar (this);
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index e9f2ed27c..1ba403cf2 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -339,7 +339,7 @@ void MainWindow::readSettings()
m_startHidden = settings.value("start_hidden", FALSE).toBool();
settings.endGroup();
show();
-
+ qApp->processEvents();
//visibility
m_playlist->setVisible(settings.value("Playlist/visible",TRUE).toBool());
m_equalizer->setVisible(settings.value("Equalizer/visible",TRUE).toBool());
@@ -402,8 +402,12 @@ void MainWindow::toggleVisibility()
if (isHidden())
{
show();
+ raise();
+ activateWindow();
m_playlist->setVisible(display->isPlaylistVisible());
m_equalizer->setVisible(display->isEqualizerVisible());
+ qApp->processEvents();
+ setFocus ();
if (isMinimized())
{
if (isMaximized())
@@ -411,17 +415,16 @@ void MainWindow::toggleVisibility()
else
showNormal();
}
- raise();
- activateWindow();
}
else
{
- hide();
if (m_playlist->isVisible())
m_playlist->hide();
if (m_equalizer->isVisible())
m_equalizer->hide();
+ hide();
}
+ qApp->processEvents();
}
void MainWindow::createActions()
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index f36dec9d1..ed64bda25 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -48,7 +48,7 @@
PlayList::PlayList (QWidget *parent)
: QWidget (parent)
{
- setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
+ setWindowFlags (/*Qt::Dialog*/Qt::Tool | Qt::FramelessWindowHint);
m_update = FALSE;
m_resize = FALSE;