Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 10:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kmediaplayer: save the current menu and status bar state after calling KXmlGuiWindow::showEvent()

Browse source 
KXmlGuiWindow::showEvent() may trigger things such as restoring the window
state

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-11-29 03:10:00 +02:00
parent 4b164a6724
commit 2795dc5695
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kmediaplayer/kmediawindow.cpp
View file

@ -94,7 +94,7 @@ KMediaWindow::KMediaWindow(QWidget *parent, Qt::WindowFlags flags)
resize(640, 480);
}
connect(m_player, SIGNAL(controlsHidden(bool)), this, SLOT(slotHideMenuBar(bool)));
connect(m_player, SIGNAL(controlsHidden(bool)), this, SLOT(slotHideBars(bool)));
m_menu = new QMenu();
m_menu->addAction(KIcon("show-menu"), i18n("Show/hide menubar"), this, SLOT(slotMenubar()));
setContextMenuPolicy(Qt::CustomContextMenu);
@ -112,8 +112,8 @@ KMediaWindow::KMediaWindow(QWidget *parent, Qt::WindowFlags flags)
KMediaWindow::~KMediaWindow()
{
slotHideMenuBar(true);
disconnect(m_player, SIGNAL(controlsHidden(bool)), this, SLOT(slotHideMenuBar(bool)));
slotHideBars(true);
disconnect(m_player, SIGNAL(controlsHidden(bool)), this, SLOT(slotHideBars(bool)));
saveAutoSaveSettings();
KConfigGroup recentfilesgroup(m_config, "RecentFiles");
@ -129,9 +129,9 @@ KMediaWindow::~KMediaWindow()
void KMediaWindow::showEvent(QShowEvent *event)
{
KXmlGuiWindow::showEvent(event);
m_menuvisible = menuBar()->isVisible();
m_statusvisible = statusBar()->isVisible();
KXmlGuiWindow::showEvent(event);
}
bool KMediaWindow::eventFilter(QObject *object, QEvent *event)
@ -142,7 +142,7 @@ bool KMediaWindow::eventFilter(QObject *object, QEvent *event)
return KXmlGuiWindow::eventFilter(object, event);
}
void KMediaWindow::slotHideMenuBar(bool visible)
void KMediaWindow::slotHideBars(bool visible)
{
if (!visible) {
m_menuvisible = menuBar()->isVisible();

2
kmediaplayer/kmediawindow.h
View file

@ -44,7 +44,7 @@ public slots:
void slotQuit();
private slots:
void slotHideMenuBar(bool hidden);
void slotHideBars(bool hidden);
protected:
void showEvent(QShowEvent *event) final;