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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-11-05 17:24:08 +08:00
parent 661529f1f4
commit 35921ed900
13 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/FluApp.cpp
View File

@ -26,14 +26,6 @@ void FluApp::init(QObject *application){
FramelessHelper::Quick::initialize();
FramelessConfig::instance()->set(Global::Option::DisableLazyInitializationForMicaMaterial);
FramelessConfig::instance()->set(Global::Option::CenterWindowBeforeShow);
FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur);
FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow);
#ifdef Q_OS_WIN
FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow,false);
#endif
#ifdef Q_OS_MACOS
FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur,false);
#endif
QQmlEngine *engine = qmlEngine(_application);
FramelessHelper::Quick::registerTypes(engine);
}

6
src/FluHttp.h
View File

@ -4,14 +4,20 @@
#include <QObject>
#include <QtQml/qqml.h>
#include <QFile>
#include <QJsonValue>
#include <QNetworkAccessManager>
#include "stdafx.h"
class HttpRequest : public QObject{
Q_OBJECT
Q_PROPERTY_AUTO(QString,url);
# if (QT_VERSION == QT_VERSION_CHECK(6, 4, 3))
Q_PROPERTY_AUTO(QJsonValue,params);
Q_PROPERTY_AUTO(QJsonValue,headers);
# else
Q_PROPERTY_AUTO(QVariant,params);
Q_PROPERTY_AUTO(QVariant,headers);
# endif
Q_PROPERTY_AUTO(QString,method);
Q_PROPERTY_AUTO(QString,downloadSavePath);
QML_NAMED_ELEMENT(HttpRequest)

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

@ -35,10 +35,9 @@ TextArea{
return placeholderNormalColor
}
selectByMouse: true
width: background.implicitWidth
width: 240
background: FluTextBoxBackground{
inputItem: control
implicitWidth: 240
}
Keys.onEnterPressed: (event)=> d.handleCommit(event)
Keys.onReturnPressed:(event)=> d.handleCommit(event)

2
src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml
View File

@ -37,9 +37,9 @@ TextField{
return placeholderNormalColor
}
selectByMouse: true
width: 240
background: FluTextBoxBackground{
inputItem: control
implicitWidth: 240
}
Keys.onEnterPressed: (event)=> d.handleCommit(event)
Keys.onReturnPressed:(event)=> d.handleCommit(event)

2
src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
View File

@ -46,9 +46,9 @@ TextField{
w = 0
return icon_end.visible ? w+36 : w+10
}
width: 240
background: FluTextBoxBackground{
inputItem: control
implicitWidth: 240
}
Keys.onEnterPressed: (event)=> d.handleCommit(event)
Keys.onReturnPressed:(event)=> d.handleCommit(event)

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

@ -46,8 +46,8 @@ Button {
layoutDirection:control.textRight ? Qt.LeftToRight : Qt.RightToLeft
Rectangle {
id:control_backgound
width: background.width
height: background.height
implicitWidth: background.implicitWidth
implicitHeight: background.implicitHeight
radius: height / 2
FluFocusRectangle{
visible: control.activeFocus

15
src/Qt5/imports/FluentUI/Controls/FluWindow.qml
View File

@ -38,7 +38,6 @@ Window {
}
signal initArgument(var argument)
id:window
flags: Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint | Qt.WindowCloseButtonHint
color:"transparent"
onStayTopChanged: {
d.changedStayTop()
@ -201,6 +200,7 @@ Window {
FramelessHelper{
id:framless_helper
onReady: {
flags = flags | Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint | Qt.WindowCloseButtonHint
if(appBar){
var title_bar = loader_title_bar.item
setTitleBarItem(title_bar)
@ -222,6 +222,19 @@ Window {
}
WindowBorder{
z:999
visible: !FluTools.isLinux()
}
Rectangle{
anchors.fill: parent
color: "#00000000"
border.width: 1
visible: FluTools.isLinux()
border.color: {
if(window.active){
return "#333333"
}
return "#999999"
}
}
function destoryOnClose(){
lifecycle.onDestoryOnClose()

3
src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
View File

@ -36,10 +36,9 @@ TextArea{
return placeholderNormalColor
}
selectByMouse: true
width: background.implicitWidth
width: 240
background: FluTextBoxBackground{
inputItem: control
implicitWidth: 240
}
Keys.onEnterPressed: (event)=> d.handleCommit(event)
Keys.onReturnPressed:(event)=> d.handleCommit(event)

2
src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml
View File

@ -38,9 +38,9 @@ TextField{
return placeholderNormalColor
}
selectByMouse: true
width: 240
background: FluTextBoxBackground{
inputItem: control
implicitWidth: 240
}
Keys.onEnterPressed: (event)=> d.handleCommit(event)
Keys.onReturnPressed:(event)=> d.handleCommit(event)

14
src/Qt6/imports/FluentUI/Controls/FluPopup.qml
View File

@ -11,13 +11,6 @@ Popup {
anchors.centerIn: Overlay.overlay
closePolicy: Popup.CloseOnEscape
enter: Transition {
NumberAnimation {
properties: "scale"
from:1.2
to:1
duration: FluTheme.enableAnimation ? 83 : 0
easing.type: Easing.OutCubic
}
NumberAnimation {
property: "opacity"
duration: FluTheme.enableAnimation ? 83 : 0
@ -26,13 +19,6 @@ Popup {
}
}
exit:Transition {
NumberAnimation {
properties: "scale"
from:1
to:1.2
duration: FluTheme.enableAnimation ? 83 : 0
easing.type: Easing.OutCubic
}
NumberAnimation {
property: "opacity"
duration: FluTheme.enableAnimation ? 83 : 0

2
src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
View File

@ -47,9 +47,9 @@ TextField{
w = 0
return icon_end.visible ? w+36 : w+10
}
width: 240
background: FluTextBoxBackground{
inputItem: control
implicitWidth: 240
}
Keys.onEnterPressed: (event)=> d.handleCommit(event)
Keys.onReturnPressed:(event)=> d.handleCommit(event)

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

@ -47,8 +47,8 @@ Button {
layoutDirection:control.textRight ? Qt.LeftToRight : Qt.RightToLeft
Rectangle {
id:control_backgound
width: background.width
height: background.height
implicitWidth: background.implicitWidth
implicitHeight: background.implicitHeight
radius: height / 2
FluFocusRectangle{
visible: control.activeFocus

15
src/Qt6/imports/FluentUI/Controls/FluWindow.qml
View File

@ -37,7 +37,6 @@ Window {
}
signal initArgument(var argument)
id:window
flags: Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint | Qt.WindowCloseButtonHint
color:"transparent"
onStayTopChanged: {
d.changedStayTop()
@ -200,6 +199,7 @@ Window {
FramelessHelper{
id:framless_helper
onReady: {
flags = flags | Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint | Qt.WindowCloseButtonHint
if(appBar){
var title_bar = loader_title_bar.item
setTitleBarItem(title_bar)
@ -221,6 +221,19 @@ Window {
}
WindowBorder{
z:999
visible: !FluTools.isLinux()
}
Rectangle{
anchors.fill: parent
color: "#00000000"
border.width: 1
visible: FluTools.isLinux()
border.color: {
if(window.active){
return "#333333"
}
return "#999999"
}
}
function destoryOnClose(){
lifecycle.onDestoryOnClose()