From 18193a18bed6a79cedcf8373e94f5578844244e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Thu, 4 Apr 2024 02:01:52 +0800 Subject: [PATCH] update --- src/FluFrameless.cpp | 2 +- src/Qt5/imports/FluentUI/Controls/FluComboBox.qml | 4 ---- src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml | 3 ++- src/Qt6/imports/FluentUI/Controls/FluComboBox.qml | 4 ---- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/FluFrameless.cpp b/src/FluFrameless.cpp index 520c3613..64becd63 100644 --- a/src/FluFrameless.cpp +++ b/src/FluFrameless.cpp @@ -76,7 +76,7 @@ void FluFrameless::componentComplete(){ HWND hwnd = reinterpret_cast(window()->winId()); DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE); if(_fixSize){ - ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION); + ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME); for (int i = 0; i < qApp->screens().count(); ++i) { connect( qApp->screens().at(i),&QScreen::logicalDotsPerInchChanged,this,[=]{ SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED); diff --git a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml b/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml index 0cbd9405..4a596278 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml @@ -62,10 +62,6 @@ T.ComboBox { validator: control.validator selectByMouse: true verticalAlignment: Text.AlignVCenter - leftInset:1 - topInset:1 - bottomInset:1 - rightInset:1 background: FluTextBoxBackground{ border.width: 0 bottomMargin: { diff --git a/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml b/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml index ea626588..82fd34df 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml @@ -20,12 +20,13 @@ FluControlBackground{ border.width: 1 gradient: Gradient { GradientStop { position: 0.0; color: d.startColor } - GradientStop { position: 0.92; color: d.startColor } + GradientStop { position: d.position; color: d.startColor } GradientStop { position: 1.0; color: d.endColor } } bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1 QtObject{ id:d + property real position: 1 - 3/control.height property color startColor: FluTheme.dark ? Qt.rgba(66/255,66/255,66/255,1) : Qt.rgba(232/255,232/255,232/255,1) property color endColor: { if(!control.enabled){ diff --git a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml b/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml index 7777b2c2..869cf5dc 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml @@ -62,10 +62,6 @@ T.ComboBox { validator: control.validator selectByMouse: true verticalAlignment: Text.AlignVCenter - leftInset:1 - topInset:1 - bottomInset:1 - rightInset:1 background: FluTextBoxBackground{ border.width: 0 bottomMargin: {