amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-22 10:40:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-04-04 02:01:52 +08:00
parent fe08b08c1f
commit 18193a18be
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/FluFrameless.cpp
View File

@ -76,7 +76,7 @@ void FluFrameless::componentComplete(){
HWND hwnd = reinterpret_cast<HWND>(window()->winId()); HWND hwnd = reinterpret_cast<HWND>(window()->winId());
DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE); DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
if(_fixSize){ 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) { for (int i = 0; i < qApp->screens().count(); ++i) {
connect( qApp->screens().at(i),&QScreen::logicalDotsPerInchChanged,this,[=]{ connect( qApp->screens().at(i),&QScreen::logicalDotsPerInchChanged,this,[=]{
SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED); SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);

4
src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
View File

@ -62,10 +62,6 @@ T.ComboBox {
validator: control.validator validator: control.validator
selectByMouse: true selectByMouse: true
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
leftInset:1
topInset:1
bottomInset:1
rightInset:1
background: FluTextBoxBackground{ background: FluTextBoxBackground{
border.width: 0 border.width: 0
bottomMargin: { bottomMargin: {

3
src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml
View File

@ -20,12 +20,13 @@ FluControlBackground{
border.width: 1 border.width: 1
gradient: Gradient { gradient: Gradient {
GradientStop { position: 0.0; color: d.startColor } 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 } GradientStop { position: 1.0; color: d.endColor }
} }
bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1 bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1
QtObject{ QtObject{
id:d 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 startColor: FluTheme.dark ? Qt.rgba(66/255,66/255,66/255,1) : Qt.rgba(232/255,232/255,232/255,1)
property color endColor: { property color endColor: {
if(!control.enabled){ if(!control.enabled){

4
src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
View File

@ -62,10 +62,6 @@ T.ComboBox {
validator: control.validator validator: control.validator
selectByMouse: true selectByMouse: true
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
leftInset:1
topInset:1
bottomInset:1
rightInset:1
background: FluTextBoxBackground{ background: FluTextBoxBackground{
border.width: 0 border.width: 0
bottomMargin: { bottomMargin: {