From abf074eaf4d694e47e88c4cb359126bb2e0f1da6 Mon Sep 17 00:00:00 2001 From: chaoticgd <43898262+chaoticgd@users.noreply.github.com> Date: Fri, 21 Mar 2025 20:40:54 +0000 Subject: [PATCH] Debugger: Fix some theming issues --- pcsx2-qt/Debugger/DebuggerWindow.cpp | 13 +- pcsx2-qt/Debugger/DebuggerWindow.h | 2 +- pcsx2-qt/Debugger/Docking/DockManager.cpp | 16 +- pcsx2-qt/Debugger/Docking/DockManager.h | 2 +- pcsx2-qt/Debugger/Docking/DockMenuBar.cpp | 174 +++++++++++++++++++++- pcsx2-qt/Debugger/Docking/DockMenuBar.h | 37 +++++ pcsx2-qt/Debugger/Docking/DockViews.cpp | 9 ++ pcsx2-qt/MainWindow.cpp | 2 +- 8 files changed, 237 insertions(+), 18 deletions(-) diff --git a/pcsx2-qt/Debugger/DebuggerWindow.cpp b/pcsx2-qt/Debugger/DebuggerWindow.cpp index a92c800412..22913f93bf 100644 --- a/pcsx2-qt/Debugger/DebuggerWindow.cpp +++ b/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,7 +207,7 @@ void DebuggerWindow::setupFonts() m_font_size--; updateFontActions(); - updateStyleSheets(); + updateTheme(); saveFontSize(); }); @@ -213,12 +215,11 @@ void DebuggerWindow::setupFonts() 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() diff --git a/pcsx2-qt/Debugger/DebuggerWindow.h b/pcsx2-qt/Debugger/DebuggerWindow.h index a35748b8dd..3999a9899b 100644 --- a/pcsx2-qt/Debugger/DebuggerWindow.h +++ b/pcsx2-qt/Debugger/DebuggerWindow.h @@ -31,7 +31,7 @@ public: void updateFontActions(); void saveFontSize(); int fontSize(); - void updateStyleSheets(); + void updateTheme(); void saveWindowGeometry(); void restoreWindowGeometry(); diff --git a/pcsx2-qt/Debugger/Docking/DockManager.cpp b/pcsx2-qt/Debugger/Docking/DockManager.cpp index abc0b0386d..1c20580c39 100644 --- a/pcsx2-qt/Debugger/Docking/DockManager.cpp +++ b/pcsx2-qt/Debugger/Docking/DockManager.cpp @@ -25,6 +25,8 @@ #include #include #include +#include +#include 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(group->tabBar()->view()); + if (QProxyStyle* style = qobject_cast(tab_bar->style())) + style->setBaseStyle(QStyleFactory::create(qApp->style()->name())); + } } bool DockManager::isLayoutLocked() diff --git a/pcsx2-qt/Debugger/Docking/DockManager.h b/pcsx2-qt/Debugger/Docking/DockManager.h index 62b0880991..d2a8c4ccb4 100644 --- a/pcsx2-qt/Debugger/Docking/DockManager.h +++ b/pcsx2-qt/Debugger/Docking/DockManager.h @@ -89,7 +89,7 @@ public: void setPrimaryDebuggerWidget(DebuggerWidget* widget, bool is_primary); void switchToDebuggerWidget(DebuggerWidget* widget); - void updateStyleSheets(); + void updateTheme(); bool isLayoutLocked(); void setLayoutLockedAndSaveSetting(bool locked); diff --git a/pcsx2-qt/Debugger/Docking/DockMenuBar.cpp b/pcsx2-qt/Debugger/Docking/DockMenuBar.cpp index e88e8bfd5e..360cac7598 100644 --- a/pcsx2-qt/Debugger/Docking/DockMenuBar.cpp +++ b/pcsx2-qt/Debugger/Docking/DockMenuBar.cpp @@ -3,16 +3,22 @@ #include "DockMenuBar.h" +#include #include #include #include +#include #include +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) { 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; @@ -20,22 +26,20 @@ DockMenuBar::DockMenuBar(QWidget* original_menu_bar, QWidget* parent) 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(from); DockLayout::Index to_index = static_cast(to); @@ -51,7 +55,6 @@ DockMenuBar::DockMenuBar(QWidget* original_menu_bar, QWidget* parent) m_layout_locked_toggle = new QPushButton; m_layout_locked_toggle->setCheckable(true); - m_layout_locked_toggle->setFlat(true); connect(m_layout_locked_toggle, &QPushButton::clicked, this, [this](bool checked) { if (m_ignore_lock_state_changed) return; @@ -59,6 +62,19 @@ DockMenuBar::DockMenuBar(QWidget* original_menu_bar, QWidget* parent) emit lockButtonToggled(checked); }); layout->addWidget(m_layout_locked_toggle); + + updateTheme(); +} + +void DockMenuBar::updateTheme() +{ + DockMenuBarStyle* style = new DockMenuBarStyle(m_layout_switcher); + m_original_menu_bar->setStyle(style); + m_layout_switcher->setStyle(style); + m_layout_locked_toggle->setStyle(style); + + delete m_style; + m_style = style; } void DockMenuBar::updateLayoutSwitcher(DockLayout::Index current_index, const std::vector& layouts) @@ -166,6 +182,27 @@ void DockMenuBar::stopBlink() } } +int DockMenuBar::innerHeight() const +{ + return m_original_menu_bar->sizeHint().height() + INNER_MENU_MARGIN * 2; +} + +void DockMenuBar::paintEvent(QPaintEvent* event) +{ + QPainter painter(this); + + // This fixes the background colour of the menu bar when using the Windows + // Vista style. + 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 +219,124 @@ void DockMenuBar::tabChanged(int index) emit newButtonClicked(); } } + +// ***************************************************************************** + +DockMenuBarStyle::DockMenuBarStyle(QObject* parent) + : QProxyStyle(QStyleFactory::create(qApp->style()->name())) +{ + setParent(parent); +} + +void DockMenuBarStyle::drawControl( + ControlElement element, + const QStyleOption* option, + QPainter* painter, + const QWidget* widget) const +{ + switch (element) + { + case CE_MenuBarItem: + { + const QStyleOptionMenuItem* opt = qstyleoption_cast(option); + if (!opt) + break; + + QWidget* menu_wrapper = widget->parentWidget(); + if (!menu_wrapper) + break; + + const DockMenuBar* menu_bar = qobject_cast(menu_wrapper->parentWidget()); + if (!menu_bar) + break; + + if (baseStyle()->name() != "fusion") + break; + + // This mirrors a check in QFusionStyle::drawControl. If act is + // false, QFusionStyle will try to draw a border along the bottom. + bool act = opt->state & State_Selected && opt->state & State_Sunken; + if (act) + break; + + // Extend the menu item to the bottom of the menu bar to fix the + // position in which it draws its bottom border. We also need to + // extend it up by the same amount so that the text isn't moved. + QStyleOptionMenuItem menu_opt = *opt; + int difference = (menu_bar->innerHeight() - option->rect.top()) - menu_opt.rect.height(); + menu_opt.rect.adjust(0, -difference, 0, difference); + QProxyStyle::drawControl(element, &menu_opt, painter, widget); + + return; + } + case CE_TabBarTab: + { + QProxyStyle::drawControl(element, option, painter, widget); + + // Draw a slick-looking highlight under the currently selected tab. + if (baseStyle()->name() == "fusion") + { + const QStyleOptionTab* tab = qstyleoption_cast(option); + if (tab && (tab->state & State_Selected)) + { + painter->setPen(tab->palette.highlight().color()); + painter->drawLine(tab->rect.bottomLeft(), tab->rect.bottomRight()); + } + } + + return; + } + case CE_MenuBarEmptyArea: + { + // Prevent it from drawing a border in the wrong position. + return; + } + default: + { + break; + } + } + + QProxyStyle::drawControl(element, option, painter, widget); +} + +QSize DockMenuBarStyle::sizeFromContents( + QStyle::ContentsType type, const QStyleOption* option, const QSize& contents_size, const QWidget* widget) const +{ + QSize size = QProxyStyle::sizeFromContents(type, option, contents_size, widget); + +#ifdef Q_OS_WIN32 + // Adjust the sizes of the layout switcher tabs depending on the theme. + if (type == CT_TabBarTab) + { + const QStyleOptionTab* opt = qstyleoption_cast(option); + if (!opt) + return size; + + const QTabBar* tab_bar = qobject_cast(widget); + if (!tab_bar) + return size; + + const DockMenuBar* menu_bar = qobject_cast(tab_bar->parentWidget()); + if (!menu_bar) + return size; + + if (baseStyle()->name() == "fusion" || baseStyle()->name() == "windowsvista") + { + // Make sure the tab extends to the bottom of the widget. + size.setHeight(menu_bar->innerHeight() - opt->rect.top()); + } + else if (baseStyle()->name() == "windows11") + { + // Adjust the size of the tab such that it is vertically centred. + size.setHeight(menu_bar->innerHeight() - opt->rect.top() * 2 - OUTER_MENU_MARGIN); + + // Make the plus button square. + if (opt->tabIndex + 1 == tab_bar->count()) + size.setWidth(size.height()); + } + } +#endif + + return size; +} diff --git a/pcsx2-qt/Debugger/Docking/DockMenuBar.h b/pcsx2-qt/Debugger/Docking/DockMenuBar.h index 6ea77e4b5f..b9197d11fc 100644 --- a/pcsx2-qt/Debugger/Docking/DockMenuBar.h +++ b/pcsx2-qt/Debugger/Docking/DockMenuBar.h @@ -6,10 +6,15 @@ #include "Debugger/Docking/DockLayout.h" #include +#include #include #include #include +class DockMenuBarStyle; + +// 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 @@ public: void updateLayoutSwitcher(DockLayout::Index current_index, const std::vector& layouts); + void updateTheme(); + // Notify the menu bar that a new layout has been selected. void onCurrentLayoutChanged(DockLayout::Index current_index); @@ -29,6 +36,8 @@ public: void updateBlink(); void stopBlink(); + int innerHeight() const; + Q_SIGNALS: void currentLayoutChanged(DockLayout::Index layout_index); void newButtonClicked(); @@ -37,9 +46,13 @@ Q_SIGNALS: 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 +66,28 @@ private: QPushButton* m_layout_locked_toggle; bool m_ignore_lock_state_changed = false; + + DockMenuBarStyle* m_style = nullptr; +}; + +// Fixes some theming issues relating to the menu bar, the layout switcher and +// the layout locked/unlocked toggle button. +class DockMenuBarStyle : public QProxyStyle +{ + Q_OBJECT + +public: + DockMenuBarStyle(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; }; diff --git a/pcsx2-qt/Debugger/Docking/DockViews.cpp b/pcsx2-qt/Debugger/Docking/DockViews.cpp index 4298c6218f..f5698e11ee 100644 --- a/pcsx2-qt/Debugger/Docking/DockViews.cpp +++ b/pcsx2-qt/Debugger/Docking/DockViews.cpp @@ -20,6 +20,7 @@ #include #include #include +#include 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(style())) + { + proxy_style->baseStyle()->setParent(qApp); + proxy_style->setBaseStyle(QStyleFactory::create(qApp->style()->name())); + } } void DockTabBar::openContextMenu(QPoint pos) diff --git a/pcsx2-qt/MainWindow.cpp b/pcsx2-qt/MainWindow.cpp index e44a0749b7..85abf85a60 100644 --- a/pcsx2-qt/MainWindow.cpp +++ b/pcsx2-qt/MainWindow.cpp @@ -1785,7 +1785,7 @@ void MainWindow::updateTheme() reloadThemeSpecificImages(); if (g_debugger_window) - g_debugger_window->updateStyleSheets(); + g_debugger_window->updateTheme(); } void MainWindow::reloadThemeSpecificImages()