feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix the window list when windows are closed

Browse Source 
After a window is closed we don't only have to update the texts of the
action, but also update their visibility state and the checked item.

Fixes: QTCREATORBUG-30381
Change-Id: Id0c343b8a5930ec2e3de03f71bdc8f2628b492b3
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2024-02-19 09:39:22 +01:00
parent 70f7e275e2
commit 814e84a5e7
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/coreplugin/windowsupport.cpp
View File

@@ -15,8 +15,8 @@
#include <utils/stringutils.h>
#include <QAction>
#include <QApplication>
#include <QEvent>
#include <QGuiApplication>
#include <QMenu>
#include <QWidget>
#include <QWindowStateChangeEvent>
@@ -106,11 +106,8 @@ bool WindowSupport::eventFilter(QObject *obj, QEvent *event)
updateFullScreenAction();
} else if (event->type() == QEvent::WindowActivate) {
m_windowList->setActiveWindow(m_window);
} else if (event->type() == QEvent::Hide) {
// minimized windows are hidden, but we still want to show them
m_windowList->setWindowVisible(m_window, m_window->isMinimized());
} else if (event->type() == QEvent::Show) {
m_windowList->setWindowVisible(m_window, true);
} else if (event->type() == QEvent::Hide || event->type() == QEvent::Show) {
m_windowList->updateVisibility(m_window);
}
return false;
}
@@ -182,9 +179,9 @@ void WindowList::activateWindow(QAction *action)
ICore::raiseWindow(m_windows.at(index));
}
void WindowList::updateTitle(QWidget *window)
void WindowList::updateTitle(QWidget *window, int i)
{
int index = m_windows.indexOf(window);
const int index = i < 0 ? m_windows.indexOf(window) : i;
QTC_ASSERT(index >= 0, return);
QTC_ASSERT(index < m_windowActions.size(), return);
QString title = window->windowTitle();
@@ -193,6 +190,19 @@ void WindowList::updateTitle(QWidget *window)
m_windowActions.at(index)->setText(Utils::quoteAmpersands(title.trimmed()));
}
void WindowList::updateVisibility(QWidget *window)
{
updateVisibility(window, m_windows.indexOf(window));
}
void WindowList::updateVisibility(QWidget *window, int index)
{
QTC_ASSERT(index >= 0, return);
QTC_ASSERT(index < m_windowActions.size(), return);
// minimized windows are hidden, but we still want to show them
m_windowActions.at(index)->setVisible(window->isVisible() || window->isMinimized());
}
void WindowList::removeWindow(QWidget *window)
{
// remove window from list,
@@ -207,8 +217,12 @@ void WindowList::removeWindow(QWidget *window)
m_windows.removeOne(window);
for (int i = index; i < m_windows.size(); ++i)
updateTitle(m_windows.at(i));
for (int i = index; i < m_windows.size(); ++i) {
QWidget *window = m_windows.at(i);
updateTitle(window, i);
updateVisibility(window, i);
}
setActiveWindow(QApplication::activeWindow());
}
void WindowList::setActiveWindow(QWidget *window)
@@ -217,13 +231,5 @@ void WindowList::setActiveWindow(QWidget *window)
m_windowActions.at(i)->setChecked(m_windows.at(i) == window);
}
void WindowList::setWindowVisible(QWidget *window, bool visible)
{
int index = m_windows.indexOf(window);
QTC_ASSERT(index >= 0, return);
QTC_ASSERT(index < m_windowActions.size(), return);
m_windowActions.at(index)->setVisible(visible);
}
} // Internal
} // Core