aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-02-02 14:50:05 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-02-02 14:50:05 +0000
commiteb86dfefbfa5ffaf93d6cd7724d421685229e84d (patch)
tree268dc7ee59d6507248663fb114d4bdca2512dfc0
parentca55666f98a4e5b310ce6be831d385b0dd7e05a7 (diff)
downloadqmmp-eb86dfefbfa5ffaf93d6cd7724d421685229e84d.tar.gz
qmmp-eb86dfefbfa5ffaf93d6cd7724d421685229e84d.tar.bz2
qmmp-eb86dfefbfa5ffaf93d6cd7724d421685229e84d.zip
fixed equalizer and playlist windows flags
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8663 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/plugins/Ui/skinned/eqwidget.cpp4
-rw-r--r--src/plugins/Ui/skinned/mainwindow.cpp3
-rw-r--r--src/plugins/Ui/skinned/playlist.cpp4
3 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index d381512ea..55ff6d797 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -443,9 +443,7 @@ void EqWidget::keyPressEvent (QKeyEvent *ke)
bool EqWidget::event (QEvent *event)
{
if(event->type() == QEvent::WinIdChange ||
- event->type() == QEvent::WindowActivate ||
- event->type() == QEvent::Show ||
- event->type() == QEvent::ShowToParent)
+ event->type() == QEvent::Show)
{
WindowSystem::ghostWindow(winId());
WindowSystem::setWinHint(winId(), "equalizer", "Qmmp");
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index ae4092390..57b0f9bde 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -272,6 +272,7 @@ void MainWindow::readSettings()
show();
qApp->processEvents();
m_playlist->setVisible(m_display->isPlaylistVisible());
+ qApp->processEvents();
m_equalizer->setVisible(m_display->isEqualizerVisible());
if(m_pl_manager->currentPlayList()->currentTrack())
@@ -299,6 +300,8 @@ void MainWindow::readSettings()
{
ACTION(ActionManager::WM_ALLWAYS_ON_TOP)->setChecked(true);
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ m_playlist->setWindowFlags(m_playlist->windowFlags() | Qt::WindowStaysOnTopHint);
+ m_equalizer->setWindowFlags(m_equalizer->windowFlags() | Qt::WindowStaysOnTopHint);
}
ACTION(ActionManager::WM_STICKY)->setChecked(settings.value("show_on_all_desktops",
false).toBool());
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 42d538d76..01a4fb2ce 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -492,9 +492,7 @@ void PlayList::readSettings()
bool PlayList::event (QEvent *event)
{
if(event->type() == QEvent::WinIdChange ||
- event->type() == QEvent::WindowActivate ||
- event->type() == QEvent::Show ||
- event->type() == QEvent::ShowToParent)
+ event->type() == QEvent::Show)
{
WindowSystem::ghostWindow(winId());
WindowSystem::setWinHint(winId(), "playlist", "Qmmp");