From fcb72b1b7474d2efd1f6b988747afe7a1e8b3d11 Mon Sep 17 00:00:00 2001 From: "John Q. Herman" Date: Mon, 20 Apr 2026 00:40:10 -0400 Subject: [PATCH] remove duplicate title bar from popout windows --- src/ui/PopOutWindow.cpp | 21 +-------------------- src/ui/PopOutWindow.h | 4 ---- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/ui/PopOutWindow.cpp b/src/ui/PopOutWindow.cpp index 4ec1c32..586d64f 100644 --- a/src/ui/PopOutWindow.cpp +++ b/src/ui/PopOutWindow.cpp @@ -2,8 +2,6 @@ #include "theme/Theme.h" #include -#include -#include #include #include #include @@ -30,20 +28,6 @@ void PopOutWindow::setupUi(const QString& title) { m_mainLayout->setContentsMargins(0, 0, 0, 0); m_mainLayout->setSpacing(0); - m_titleBar = new QWidget(this); - m_titleBar->setObjectName("PopOutTitleBar"); - m_titleBar->setFixedHeight(36); - - QHBoxLayout* titleLayout = new QHBoxLayout(m_titleBar); - titleLayout->setContentsMargins(12, 0, 8, 0); - titleLayout->setSpacing(8); - - m_titleLabel = new QLabel(title, m_titleBar); - m_titleLabel->setProperty("role", "header"); - titleLayout->addWidget(m_titleLabel); - - m_mainLayout->addWidget(m_titleBar); - m_contentContainer = new QWidget(this); m_contentContainer->setObjectName("PopOutContent"); QVBoxLayout* contentLayout = new QVBoxLayout(m_contentContainer); @@ -80,14 +64,11 @@ void PopOutWindow::showAndRestore() { } void PopOutWindow::setMinimumContentSize(int width, int height) { - setMinimumSize(width, height + m_titleBar->height()); + setMinimumSize(width, height); } void PopOutWindow::setWindowTitle(const QString& title) { QDialog::setWindowTitle(title); - if (m_titleLabel) { - m_titleLabel->setText(title); - } } void PopOutWindow::closeEvent(QCloseEvent* event) { diff --git a/src/ui/PopOutWindow.h b/src/ui/PopOutWindow.h index 7fce75f..56279da 100644 --- a/src/ui/PopOutWindow.h +++ b/src/ui/PopOutWindow.h @@ -4,8 +4,6 @@ #include class QVBoxLayout; -class QHBoxLayout; -class QLabel; namespace OpenMix { @@ -43,8 +41,6 @@ class PopOutWindow : public QDialog { QString m_settingsKey; QWidget* m_content = nullptr; QVBoxLayout* m_mainLayout = nullptr; - QWidget* m_titleBar = nullptr; - QLabel* m_titleLabel = nullptr; QWidget* m_contentContainer = nullptr; bool m_geometryLoaded = false;