Debugger: Fix some theming issues

Author: chaoticgd

pcsx2-qt/Debugger/DebuggerWindow.cpp

@@ -114,6 +114,8 @@ DebuggerWindow::DebuggerWindow(QWidget* parent)
 
 	setMenuWidget(m_dock_manager->createMenuBar(menu_bar));
 
+	updateTheme();
+
 	Host::RunOnCPUThread([]() {
 		R5900SymbolImporter.OnDebuggerOpened();
 	});
@@ -193,7 +195,7 @@ void DebuggerWindow::setupFonts()
 		m_font_size++;
 
 		updateFontActions();
-		updateStyleSheets();
+		updateTheme();
 		saveFontSize();
 	});
 
@@ -205,20 +207,19 @@ void DebuggerWindow::setupFonts()
 		m_font_size--;
 
 		updateFontActions();
-		updateStyleSheets();
+		updateTheme();
 		saveFontSize();
 	});
 
 	connect(m_ui.actionResetFontSize, &QAction::triggered, this, [this]() {
 		m_font_size = DEFAULT_FONT_SIZE;
 
 		updateFontActions();
-		updateStyleSheets();
+		updateTheme();
 		saveFontSize();
 	});
 
 	updateFontActions();
-	updateStyleSheets();
 }
 
 void DebuggerWindow::updateFontActions()
@@ -239,7 +240,7 @@ int DebuggerWindow::fontSize()
 	return m_font_size;
 }
 
-void DebuggerWindow::updateStyleSheets()
+void DebuggerWindow::updateTheme()
 {
 	// TODO: Migrate away from stylesheets to improve performance.
 	if (m_font_size != DEFAULT_FONT_SIZE)
@@ -252,7 +253,7 @@ void DebuggerWindow::updateStyleSheets()
 		setStyleSheet(QString());
 	}
 
-	dockManager().updateStyleSheets();
+	dockManager().updateTheme();
 }
 
 void DebuggerWindow::saveWindowGeometry()

pcsx2-qt/Debugger/DebuggerWindow.h

@@ -31,7 +31,7 @@ class DebuggerWindow : public KDDockWidgets::QtWidgets::MainWindow
 	void updateFontActions();
 	void saveFontSize();
 	int fontSize();
-	void updateStyleSheets();
+	void updateTheme();
 
 	void saveWindowGeometry();
 	void restoreWindowGeometry();

pcsx2-qt/Debugger/Docking/DockManager.cpp

@@ -25,6 +25,8 @@
 #include <QtCore/QTimer>
 #include <QtCore/QtTranslation>
 #include <QtWidgets/QMessageBox>
+#include <QtWidgets/QProxyStyle>
+#include <QtWidgets/QStyleFactory>
 
 DockManager::DockManager(QObject* parent)
 	: QObject(parent)
@@ -757,11 +759,23 @@ void DockManager::switchToDebuggerWidget(DebuggerWidget* widget)
 	}
 }
 
-void DockManager::updateStyleSheets()
+void DockManager::updateTheme()
 {
+	if (m_menu_bar)
+		m_menu_bar->updateTheme();
+
 	for (DockLayout& layout : m_layouts)
 		for (const auto& [unique_name, widget] : layout.debuggerWidgets())
 			widget->updateStyleSheet();
+
+	// KDDockWidgets::QtWidgets::TabBar sets its own style to a subclass of
+	// QProxyStyle in its constructor, so we need to update that here.
+	for (KDDockWidgets::Core::Group* group : KDDockWidgets::DockRegistry::self()->groups())
+	{
+		auto tab_bar = static_cast<KDDockWidgets::QtWidgets::TabBar*>(group->tabBar()->view());
+		if (QProxyStyle* style = qobject_cast<QProxyStyle*>(tab_bar->style()))
+			style->setBaseStyle(QStyleFactory::create(qApp->style()->name()));
+	}
 }
 
 bool DockManager::isLayoutLocked()

pcsx2-qt/Debugger/Docking/DockManager.h

@@ -89,7 +89,7 @@ class DockManager : public QObject
 	void setPrimaryDebuggerWidget(DebuggerWidget* widget, bool is_primary);
 	void switchToDebuggerWidget(DebuggerWidget* widget);
 
-	void updateStyleSheets();
+	void updateTheme();
 
 	bool isLayoutLocked();
 	void setLayoutLockedAndSaveSetting(bool locked);

pcsx2-qt/Debugger/Docking/DockMenuBar.cpp

@@ -3,39 +3,45 @@
 
 #include "DockMenuBar.h"
 
+#include <QtCore/QTimer>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
 #include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QStyleOption>
 
+static const int OUTER_MENU_MARGIN = 2;
+static const int INNER_MENU_MARGIN = 4;
+
 DockMenuBar::DockMenuBar(QWidget* original_menu_bar, QWidget* parent)
 	: QWidget(parent)
+	, m_original_menu_bar(original_menu_bar)
 {
+	setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+
 	QHBoxLayout* layout = new QHBoxLayout;
-	layout->setContentsMargins(0, 2, 2, 0);
+	layout->setContentsMargins(0, OUTER_MENU_MARGIN, OUTER_MENU_MARGIN, 0);
 	setLayout(layout);
 
 	QWidget* menu_wrapper = new QWidget;
 	menu_wrapper->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
 	layout->addWidget(menu_wrapper);
 
 	QHBoxLayout* menu_layout = new QHBoxLayout;
-	menu_layout->setContentsMargins(0, 4, 0, 4);
+	menu_layout->setContentsMargins(0, INNER_MENU_MARGIN, 0, INNER_MENU_MARGIN);
 	menu_wrapper->setLayout(menu_layout);
 
 	menu_layout->addWidget(original_menu_bar);
 
 	m_layout_switcher = new QTabBar;
 	m_layout_switcher->setContentsMargins(0, 0, 0, 0);
-	m_layout_switcher->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+	m_layout_switcher->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 	m_layout_switcher->setContextMenuPolicy(Qt::CustomContextMenu);
+	m_layout_switcher->setDrawBase(false);
+	m_layout_switcher->setExpanding(false);
 	m_layout_switcher->setMovable(true);
 	layout->addWidget(m_layout_switcher);
 
-	QWidget* spacer = new QWidget;
-	spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-	layout->addWidget(spacer);
-
 	connect(m_layout_switcher, &QTabBar::tabMoved, this, [this](int from, int to) {
 		DockLayout::Index from_index = static_cast<DockLayout::Index>(from);
 		DockLayout::Index to_index = static_cast<DockLayout::Index>(to);
@@ -59,6 +65,26 @@ DockMenuBar::DockMenuBar(QWidget* original_menu_bar, QWidget* parent)
 		emit lockButtonToggled(checked);
 	});
 	layout->addWidget(m_layout_locked_toggle);
+
+	updateTheme();
+}
+
+void DockMenuBar::updateTheme()
+{
+	bool needs_new_style = false;
+
+	if (!m_style)
+	{
+		m_style = new DockLayoutSwitcherStyle(m_layout_switcher);
+		m_layout_switcher->setStyle(m_style);
+
+		needs_new_style = true;
+	}
+
+	if (needs_new_style || m_style->baseStyle()->name() != qApp->style()->name())
+		m_style->setBaseStyle(QStyleFactory::create(qApp->style()->name()));
+
+	m_layout_locked_toggle->setStyleSheet("color: palette(text)");
 }
 
 void DockMenuBar::updateLayoutSwitcher(DockLayout::Index current_index, const std::vector<DockLayout>& layouts)
@@ -166,6 +192,32 @@ void DockMenuBar::stopBlink()
 	}
 }
 
+int DockMenuBar::innerHeight() const
+{
+	return m_original_menu_bar->sizeHint().height() + INNER_MENU_MARGIN * 2;
+}
+
+QSize DockMenuBar::sizeHint() const
+{
+	return QSize(m_original_menu_bar->sizeHint().width(), innerHeight() + OUTER_MENU_MARGIN);
+}
+
+void DockMenuBar::paintEvent(QPaintEvent* event)
+{
+	QPainter painter(this);
+
+	// This fixes the background colour of the menu bar when using the WIndows
+	// classic theme.
+	QStyleOptionMenuItem menu_option;
+	menu_option.palette = palette();
+	menu_option.state = QStyle::State_None;
+	menu_option.menuItemType = QStyleOptionMenuItem::EmptyArea;
+	menu_option.checkType = QStyleOptionMenuItem::NotCheckable;
+	menu_option.rect = rect();
+	menu_option.menuRect = rect();
+	style()->drawControl(QStyle::CE_MenuBarEmptyArea, &menu_option, &painter, this);
+}
+
 void DockMenuBar::tabChanged(int index)
 {
 	// Prevent recursion.
@@ -182,3 +234,58 @@ void DockMenuBar::tabChanged(int index)
 		emit newButtonClicked();
 	}
 }
+
+// *****************************************************************************
+
+DockLayoutSwitcherStyle::DockLayoutSwitcherStyle(QObject* parent)
+	: QProxyStyle(nullptr)
+{
+	setParent(parent);
+}
+
+void DockLayoutSwitcherStyle::drawControl(
+	ControlElement element,
+	const QStyleOption* option,
+	QPainter* painter,
+	const QWidget* widget) const
+{
+	QProxyStyle::drawControl(element, option, painter, widget);
+
+	// Draw a slick-looking highlight under the currently selected tab.
+	if (element == CE_TabBarTab && baseStyle()->name() == "fusion")
+	{
+		const QStyleOptionTab* tab = qstyleoption_cast<const QStyleOptionTab*>(option);
+		if (tab && (tab->state & State_Selected))
+		{
+			painter->setPen(tab->palette.highlight().color());
+			painter->drawLine(tab->rect.bottomLeft(), tab->rect.bottomRight());
+		}
+	}
+}
+
+QSize DockLayoutSwitcherStyle::sizeFromContents(
+	QStyle::ContentsType type, const QStyleOption* option, const QSize& contents_size, const QWidget* widget) const
+{
+	QSize size = QProxyStyle::sizeFromContents(type, option, contents_size, widget);
+
+	DockMenuBar* menu_bar = qobject_cast<DockMenuBar*>(widget->parent());
+	if (!menu_bar)
+		return size;
+
+	// Adjust the size of the layout switcher tabs depending on the theme.
+	if (type == CT_TabBarTab)
+	{
+		if (baseStyle()->name() == "fusion" || baseStyle()->name() == "windowsvista")
+		{
+			// Make sure the tab extends to the bottom of the widget.
+			size.setHeight(menu_bar->innerHeight() - option->rect.top());
+		}
+		else if (baseStyle()->name() == "windows11")
+		{
+			// Make sure the tab is centred vertically.
+			size.setHeight(menu_bar->innerHeight() - option->rect.top() * 2);
+		}
+	}
+
+	return size;
+}

pcsx2-qt/Debugger/Docking/DockMenuBar.h

@@ -6,10 +6,15 @@
 #include "Debugger/Docking/DockLayout.h"
 
 #include <QtWidgets/QMenuBar>
+#include <QtWidgets/QProxyStyle>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QTabBar>
 #include <QtWidgets/QWidget>
 
+class DockLayoutSwitcherStyle;
+
+// The widget that replaces the normal menu bar. This contains the original menu
+// bar, the layout switcher and the layout locked/unlocked toggle button.
 class DockMenuBar : public QWidget
 {
 	Q_OBJECT
@@ -19,6 +24,8 @@ class DockMenuBar : public QWidget
 
 	void updateLayoutSwitcher(DockLayout::Index current_index, const std::vector<DockLayout>& layouts);
 
+	void updateTheme();
+
 	// Notify the menu bar that a new layout has been selected.
 	void onCurrentLayoutChanged(DockLayout::Index current_index);
 
@@ -29,6 +36,10 @@ class DockMenuBar : public QWidget
 	void updateBlink();
 	void stopBlink();
 
+	int innerHeight() const;
+
+	QSize sizeHint() const override;
+
 Q_SIGNALS:
 	void currentLayoutChanged(DockLayout::Index layout_index);
 	void newButtonClicked();
@@ -37,9 +48,13 @@ class DockMenuBar : public QWidget
 
 	void layoutSwitcherContextMenuRequested(const QPoint& pos, QTabBar* layout_switcher);
 
+protected:
+	void paintEvent(QPaintEvent* event) override;
+
 private:
 	void tabChanged(int index);
 
+	QWidget* m_original_menu_bar;
 
 	QTabBar* m_layout_switcher;
 	QMetaObject::Connection m_tab_connection;
@@ -53,4 +68,28 @@ class DockMenuBar : public QWidget
 
 	QPushButton* m_layout_locked_toggle;
 	bool m_ignore_lock_state_changed = false;
+
+	DockLayoutSwitcherStyle* m_style = nullptr;
+};
+
+// Highlight the selected tab with an underline, and improve the appearance of
+// the layout switcher when the Windows Vista or Windows 11 styles are used.
+class DockLayoutSwitcherStyle : public QProxyStyle
+{
+	Q_OBJECT
+
+public:
+	DockLayoutSwitcherStyle(QObject* parent = nullptr);
+
+	void drawControl(
+		ControlElement element,
+		const QStyleOption* option,
+		QPainter* painter,
+		const QWidget* widget = nullptr) const override;
+
+	QSize sizeFromContents(
+		QStyle::ContentsType type,
+		const QStyleOption* option,
+		const QSize& contents_size,
+		const QWidget* widget = nullptr) const override;
 };

pcsx2-qt/Debugger/Docking/DockViews.cpp

@@ -20,6 +20,7 @@
 #include <QtWidgets/QInputDialog>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QMenu>
+#include <QtWidgets/QStyleFactory>
 
 KDDockWidgets::Core::View* DockViewFactory::createDockWidget(
 	const QString& unique_name,
@@ -143,6 +144,14 @@ DockTabBar::DockTabBar(KDDockWidgets::Core::TabBar* controller, QWidget* parent)
 {
 	setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(this, &DockTabBar::customContextMenuRequested, this, &DockTabBar::openContextMenu);
+
+	// The constructor of KDDockWidgets::QtWidgets::TabBar makes a QProxyStyle
+	// that ends up taking ownerhsip of the style for the entire application!
+	if (QProxyStyle* proxy_style = qobject_cast<QProxyStyle*>(style()))
+	{
+		proxy_style->baseStyle()->setParent(qApp);
+		proxy_style->setBaseStyle(QStyleFactory::create(qApp->style()->name()));
+	}
 }
 
 void DockTabBar::openContextMenu(QPoint pos)

pcsx2-qt/MainWindow.cpp

@@ -1781,7 +1781,7 @@ void MainWindow::updateTheme()
 	reloadThemeSpecificImages();
 
 	if (g_debugger_window)
-		g_debugger_window->updateStyleSheets();
+		g_debugger_window->updateTheme();
 }
 
 void MainWindow::reloadThemeSpecificImages()