From 6e1694111f006b11fb9f2a95ed7b283c3e13f34a Mon Sep 17 00:00:00 2001 From: xboxones1 <91512529+xboxones1@users.noreply.github.com> Date: Mon, 8 Sep 2025 09:17:32 +0900 Subject: [PATCH] Several ui fixes (#11967) * Fix background color error for invalid autotype shortcut * Fix alignment in autotype settings * Fix contrast for splitter handle * Fix font size reset when changing theme --------- Co-authored-by: Jonathan White --- src/gui/ApplicationSettingsWidget.cpp | 6 +++++- src/gui/ApplicationSettingsWidgetGeneral.ui | 3 +++ src/gui/MainWindow.cpp | 1 + src/gui/dbsettings/DatabaseSettingsWidgetEncryption.ui | 1 - src/gui/styles/base/BaseStyle.cpp | 9 +++++---- src/gui/styles/dark/darkstyle.qss | 4 ---- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp index 3d1a0e321..c7bea73f3 100644 --- a/src/gui/ApplicationSettingsWidget.cpp +++ b/src/gui/ApplicationSettingsWidget.cpp @@ -31,6 +31,7 @@ #include "gui/Icons.h" #include "gui/MainWindow.h" #include "gui/osutils/OSUtils.h" +#include "gui/styles/StateColorPalette.h" #include "quickunlock/QuickUnlockInterface.h" #include "FileDialog.h" @@ -136,7 +137,10 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent) m_generalUi->autoTypeShortcutWidget->setStyleSheet(""); } else { QToolTip::showText(mapToGlobal(rect().bottomLeft()), error); - m_generalUi->autoTypeShortcutWidget->setStyleSheet("background-color: #FF9696;"); + StateColorPalette statePalette; + auto color = statePalette.color(StateColorPalette::ColorRole::Error); + m_generalUi->autoTypeShortcutWidget->setStyleSheet( + QString("QLineEdit { background: %1; }").arg(color.name())); } }); connect(m_generalUi->autoTypeShortcutWidget, &ShortcutWidget::shortcutReset, this, [this] { diff --git a/src/gui/ApplicationSettingsWidgetGeneral.ui b/src/gui/ApplicationSettingsWidgetGeneral.ui index 71ea8c47f..17c75d994 100644 --- a/src/gui/ApplicationSettingsWidgetGeneral.ui +++ b/src/gui/ApplicationSettingsWidgetGeneral.ui @@ -1357,6 +1357,9 @@ Remember last typed entry for: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 927406ded..97be28c39 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -2015,6 +2015,7 @@ void MainWindow::initViewMenu() restartApp(tr("You must restart the application to apply this setting. Would you like to restart now?")); } else { kpxcApp->applyTheme(); + kpxcApp->applyFontSize(); } }); diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.ui b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.ui index dd5efe671..581bc6ca2 100644 --- a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.ui +++ b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.ui @@ -537,7 +537,6 @@ transformBenchmarkButton memorySpinBox parallelismSpinBox - advancedSettingsButton diff --git a/src/gui/styles/base/BaseStyle.cpp b/src/gui/styles/base/BaseStyle.cpp index 8fa8f64bb..471744c35 100644 --- a/src/gui/styles/base/BaseStyle.cpp +++ b/src/gui/styles/base/BaseStyle.cpp @@ -319,6 +319,7 @@ namespace Phantom S_sliderHandle_pressed, S_sliderHandle_specular, S_sliderHandle_pressed_specular, + S_splitterHandle, S_base_shadow, S_base_divider, S_windowText_disabled, @@ -435,7 +436,8 @@ namespace Phantom isLight ? colors[S_button_pressed] : Dc::adjustLightness(colors[S_button_pressed], 0.03); colors[S_sliderHandle_pressed_specular] = isLight ? Dc::specularOf(colors[S_sliderHandle_pressed]) : Dc::lightSpecularOf(colors[S_sliderHandle_pressed]); - + colors[S_splitterHandle] = + isLight ? Dc::adjustLightness(colors[S_window], -0.1) : Dc::adjustLightness(colors[S_window], 0.15); colors[S_base_shadow] = Dc::overhangShadowOf(colors[S_base]); colors[S_base_divider] = colors[S_window_divider]; colors[S_windowText_disabled] = pal.color(QPalette::Disabled, QPalette::WindowText); @@ -2206,7 +2208,7 @@ void BaseStyle::drawControl(ControlElement element, if (r.width() < 5 || r.height() < 5) break; int length = Ph::dpiScaled(Ph::SplitterMaxLength); - int thickness = Ph::dpiScaled(1); + int thickness = Ph::dpiScaled(2); QSize size; if (option->state & State_Horizontal) { if (r.height() < length) @@ -2218,8 +2220,7 @@ void BaseStyle::drawControl(ControlElement element, size = QSize(length, thickness); } QRect filledRect = QStyle::alignedRect(option->direction, Qt::AlignCenter, size, r); - painter->fillRect(filledRect, swatch.color(S_button_specular)); - Ph::fillRectOutline(painter, filledRect.adjusted(-1, 0, 1, 0), 1, swatch.color(S_window_divider)); + painter->fillRect(filledRect, swatch.color(S_splitterHandle)); break; } // TODO update this for phantom diff --git a/src/gui/styles/dark/darkstyle.qss b/src/gui/styles/dark/darkstyle.qss index 716430113..e65efded6 100644 --- a/src/gui/styles/dark/darkstyle.qss +++ b/src/gui/styles/dark/darkstyle.qss @@ -29,10 +29,6 @@ QPushButton:default:hover, QPushButton:checked:hover { background: #2E582E; } -QSplitterHandle { - background-color: #56565A; -} - QToolTip { color: #BFBFBF; background-color: #2D532D;