amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-07-07 03:25:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi
2024-03-06 21:00:49 +08:00
parent 2ae2e2509a
commit 0d9d459d68
14 changed files with 112 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ Button{
id:color_dialog
implicitWidth: 326
implicitHeight: 560
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
closePolicy: Popup.CloseOnEscape
Rectangle{
id:layout_actions
width: parent.width
@ -280,7 +280,6 @@ Button{
onPressed:(mouse)=> handleMouse(mouse)
}
}
FluClip{
width: 40
height: 200

31
src/Qt5/imports/FluentUI/Controls/FluFilledButton.qml
View File

@ -37,15 +37,30 @@ Button {
visible: control.visualFocus
radius:4
}
color:{
if(!enabled){
return disableColor
}
if(pressed){
return pressedColor
}
return hovered ? hoverColor :normalColor
gradient: Gradient {
GradientStop { position: 0.33; color: control.normalColor }
GradientStop { position: 1.0; color: Qt.darker(control.normalColor,1.3) }
}
Rectangle{
radius: parent.radius
anchors{
fill: parent
topMargin: 1
leftMargin: 1
rightMargin: 1
bottomMargin: 2
}
color:{
if(!enabled){
return disableColor
}
if(pressed){
return pressedColor
}
return hovered ? hoverColor :normalColor
}
}
}
contentItem: FluText {
text: control.text

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

@ -31,8 +31,6 @@ Window {
return FluTheme.windowBackgroundColor
}
property bool stayTop: false
property var _pageRegister
property string _route
property bool showDark: false
property bool showClose: true
property bool showMinimize: true
@ -65,6 +63,8 @@ Window {
property int _realHeight
property int _realWidth
property int _appBarHeight: appBar.height
property var _windowRegister
property string _route
id:window
color:"transparent"
Component.onCompleted: {
@ -280,7 +280,7 @@ Window {
if(FluTools.isWindows10OrGreater()){
return undefined
}
if(window.visibility == Window.Maximized || window.visibility == Window.FullScreen){
if(window.visibility === Window.Maximized || window.visibility === Window.FullScreen){
return undefined
}
return com_border
@ -310,9 +310,6 @@ Window {
function showError(text,duration,moremsg){
infoBar.showError(text,duration,moremsg)
}
function registerForWindowResult(path){
return lifecycle.createRegister(window,path)
}
function moveWindowToDesktopCenter(){
screen = Qt.application.screens[FluTools.cursorScreenIndex()]
var taskBarHeight = FluTools.getTaskBarHeight(window)
@ -326,9 +323,12 @@ Window {
window.minimumHeight = window.height
}
}
function registerForWindowResult(path){
return FluApp.createWindowRegister(window,path)
}
function onResult(data){
if(_pageRegister){
_pageRegister.onResult(data)
if(_windowRegister){
_windowRegister.onResult(data)
}
}
function layoutContainer(){

24
src/Qt5/imports/FluentUI/plugins.qmltypes
View File

@ -502,12 +502,6 @@ Module {
Parameter { name: "visible"; type: "bool" }
}
Method { name: "onDestoryOnClose" }
Method {
name: "createRegister"
type: "QVariant"
Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
Parameter { name: "path"; type: "string" }
}
}
Component {
name: "FluWindowType"
@ -2386,7 +2380,7 @@ Module {
}
Property {
name: "buttonDark"
type: "FluToggleSwitch_QMLTYPE_22"
type: "FluToggleSwitch_QMLTYPE_21"
isReadonly: true
isPointer: true
}
@ -3044,15 +3038,15 @@ Module {
defaultProperty: "data"
Property { name: "logo"; type: "QUrl" }
Property { name: "title"; type: "string" }
Property { name: "items"; type: "FluObject_QMLTYPE_149"; isPointer: true }
Property { name: "footerItems"; type: "FluObject_QMLTYPE_149"; isPointer: true }
Property { name: "items"; type: "FluObject_QMLTYPE_156"; isPointer: true }
Property { name: "footerItems"; type: "FluObject_QMLTYPE_156"; isPointer: true }
Property { name: "displayMode"; type: "int" }
Property { name: "autoSuggestBox"; type: "QQmlComponent"; isPointer: true }
Property { name: "actionItem"; type: "QQmlComponent"; isPointer: true }
Property { name: "topPadding"; type: "int" }
Property { name: "pageMode"; type: "int" }
Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_38"; isPointer: true }
Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_38"; isPointer: true }
Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_33"; isPointer: true }
Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_33"; isPointer: true }
Property { name: "navCompactWidth"; type: "int" }
Property { name: "navTopMargin"; type: "int" }
Property { name: "cellHeight"; type: "int" }
@ -3869,8 +3863,6 @@ Module {
Property { name: "appBar"; type: "QQuickItem"; isPointer: true }
Property { name: "backgroundColor"; type: "QColor" }
Property { name: "stayTop"; type: "bool" }
Property { name: "_pageRegister"; type: "QVariant" }
Property { name: "_route"; type: "string" }
Property { name: "showDark"; type: "bool" }
Property { name: "showClose"; type: "bool" }
Property { name: "showMinimize"; type: "bool" }
@ -3888,6 +3880,8 @@ Module {
Property { name: "_realHeight"; type: "int" }
Property { name: "_realWidth"; type: "int" }
Property { name: "_appBarHeight"; type: "int" }
Property { name: "_windowRegister"; type: "QVariant" }
Property { name: "_route"; type: "string" }
Property { name: "content"; type: "QObject"; isList: true; isReadonly: true }
Signal { name: "showSystemMenu" }
Signal {
@ -3931,13 +3925,13 @@ Module {
Parameter { name: "duration"; type: "QVariant" }
Parameter { name: "moremsg"; type: "QVariant" }
}
Method { name: "moveWindowToDesktopCenter"; type: "QVariant" }
Method { name: "fixWindowSize"; type: "QVariant" }
Method {
name: "registerForWindowResult"
type: "QVariant"
Parameter { name: "path"; type: "QVariant" }
}
Method { name: "moveWindowToDesktopCenter"; type: "QVariant" }
Method { name: "fixWindowSize"; type: "QVariant" }
Method {
name: "onResult"
type: "QVariant"