noham/archived-Reclass
1
0
Fork 0
mirror of https://github.com/NohamR/Reclass.git synced 2026-05-10 19:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: align workspace dock header with MDI tab bar, dim tab text

Browse Source 
Use QProxyStyle for tab height (24px) and text color instead of CSS.
Selected/hover tabs now use textDim to match the dock header.
This commit is contained in:
IChooseYou
2026-02-24 15:16:33 -07:00
parent 4941f860b6
commit 62a68bef80
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main.cpp
View File

@@ -244,6 +244,8 @@ public:
s.setHeight(s.height() + qRound(s.height() * 0.5)); s.setHeight(s.height() + qRound(s.height() * 0.5));
if (type == CT_MenuItem) if (type == CT_MenuItem)
s = QSize(s.width() + 24, s.height() + 4); s = QSize(s.width() + 24, s.height() + 4);
if (type == CT_TabBarTab)
s = QSize(s.width(), 24);
return s; return s;
} }
int pixelMetric(PixelMetric metric, const QStyleOption* opt, int pixelMetric(PixelMetric metric, const QStyleOption* opt,
@@ -312,6 +314,21 @@ public:
} }
} }
} }
// MDI tab bar — override text color: dimmed for selected/hover
if (element == CE_TabBarTabLabel) {
if (auto* tab = qstyleoption_cast<const QStyleOptionTab*>(opt)) {
const auto& t = rcx::ThemeManager::instance().current();
QStyleOptionTab patched = *tab;
bool selected = tab->state & State_Selected;
bool hovered = tab->state & State_MouseOver;
if (selected || hovered)
patched.palette.setColor(QPalette::WindowText, t.textDim);
else
patched.palette.setColor(QPalette::WindowText, t.textMuted);
QProxyStyle::drawControl(element, &patched, p, w);
return;
}
}
// Tree view items — use theme.hover for selection instead of blue // Tree view items — use theme.hover for selection instead of blue
if (element == CE_ItemViewItem) { if (element == CE_ItemViewItem) {
if (auto* vi = qstyleoption_cast<const QStyleOptionViewItem*>(opt)) { if (auto* vi = qstyleoption_cast<const QStyleOptionViewItem*>(opt)) {
@@ -1646,15 +1663,14 @@ void MainWindow::applyTheme(const Theme& theme) {
// Update border overlay color // Update border overlay color
updateBorderColor(isActiveWindow() ? theme.borderFocused : theme.border); updateBorderColor(isActiveWindow() ? theme.borderFocused : theme.border);
// MDI area tabs // MDI area tabs — text color + height handled by MenuBarStyle QProxyStyle
m_mdiArea->setStyleSheet(QStringLiteral( m_mdiArea->setStyleSheet(QStringLiteral(
"QTabBar::tab {" "QTabBar::tab {"
" background: %1; color: %2; padding: 0px 16px; border: none; height: 24px;" " background: %1; padding: 0px 16px; border: none;"
"}" "}"
"QTabBar::tab:selected { color: %3; background: %4; }" "QTabBar::tab:selected { background: %2; }"
"QTabBar::tab:hover { color: %3; background: %5; }") "QTabBar::tab:hover { background: %3; }")
.arg(theme.background.name(), theme.textMuted.name(), theme.text.name(), .arg(theme.background.name(), theme.backgroundAlt.name(), theme.hover.name()));
theme.backgroundAlt.name(), theme.hover.name()));
// Re-style ✕ close buttons on MDI tabs // Re-style ✕ close buttons on MDI tabs
styleTabCloseButtons(); styleTabCloseButtons();
@@ -2393,6 +2409,7 @@ void MainWindow::createWorkspaceDock() {
const auto& t = ThemeManager::instance().current(); const auto& t = ThemeManager::instance().current();
auto* titleBar = new QWidget(m_workspaceDock); auto* titleBar = new QWidget(m_workspaceDock);
titleBar->setFixedHeight(24);
titleBar->setAutoFillBackground(true); titleBar->setAutoFillBackground(true);
{ {
QPalette tbPal = titleBar->palette(); QPalette tbPal = titleBar->palette();