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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-01-02 22:55:17 +08:00
parent 284afed52f
commit cc4e88adbd
8 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/qml-Qt6/page/T_TabView.qml
View File

@ -67,10 +67,10 @@ FluScrollablePage{
text:"Always" text:"Always"
Layout.preferredWidth: 120 Layout.preferredWidth: 120
FluMenuItem{ FluMenuItem{
text:"Nerver" text:"Never"
onClicked: { onClicked: {
btn_close_button_visibility.text = text btn_close_button_visibility.text = text
tab_view.closeButtonVisibility = FluTabViewType.Nerver tab_view.closeButtonVisibility = FluTabViewType.Never
} }
} }
FluMenuItem{ FluMenuItem{

4
example/qml/page/T_TabView.qml
View File

@ -68,10 +68,10 @@ FluScrollablePage{
text:"Always" text:"Always"
Layout.preferredWidth: 120 Layout.preferredWidth: 120
FluMenuItem{ FluMenuItem{
text:"Nerver" text:"Never"
onClicked: { onClicked: {
btn_close_button_visibility.text = text btn_close_button_visibility.text = text
tab_view.closeButtonVisibility = FluTabViewType.Nerver tab_view.closeButtonVisibility = FluTabViewType.Never
} }
} }
FluMenuItem{ FluMenuItem{

2
src/Def.h
View File

@ -145,7 +145,7 @@ enum TabWidthBehavior {
}; };
Q_ENUM_NS(TabWidthBehavior) Q_ENUM_NS(TabWidthBehavior)
enum CloseButtonVisibility { enum CloseButtonVisibility {
Nerver = 0x0000, Never = 0x0000,
Always = 0x0001, Always = 0x0001,
OnHover = 0x0002 OnHover = 0x0002
}; };

1
src/Qt5/imports/FluentUI/Controls/FluAppBar.qml
View File

@ -44,6 +44,7 @@ Rectangle{
d.win.visibility = Window.Windowed d.win.visibility = Window.Windowed
else else
d.win.visibility = Window.Maximized d.win.visibility = Window.Maximized
d.hoverMaxBtn = false
} }
} }
property var minClickListener: function(){ property var minClickListener: function(){

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

@ -236,7 +236,7 @@ Item {
width: visible ? 24 : 0 width: visible ? 24 : 0
height: 24 height: 24
visible: { visible: {
if(closeButtonVisibility === FluTabViewType.Nerver) if(closeButtonVisibility === FluTabViewType.Never)
return false return false
if(closeButtonVisibility === FluTabViewType.OnHover) if(closeButtonVisibility === FluTabViewType.OnHover)
return item_mouse_hove.containsMouse || item_btn_close.hovered return item_mouse_hove.containsMouse || item_btn_close.hovered

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

@ -80,6 +80,8 @@ Module {
prototype: "QObject" prototype: "QObject"
exports: ["FluentUI/FluFramelessHelper 1.0"] exports: ["FluentUI/FluFramelessHelper 1.0"]
exportMetaObjectRevisions: [0] exportMetaObjectRevisions: [0]
Signal { name: "loadCompleted" }
Method { name: "showSystemMenu" }
} }
Component { Component {
name: "FluNavigationViewType" name: "FluNavigationViewType"
@ -186,7 +188,7 @@ Module {
Enum { Enum {
name: "CloseButtonVisibility" name: "CloseButtonVisibility"
values: { values: {
"Nerver": 0, "Never": 0,
"Always": 1, "Always": 1,
"OnHover": 2 "OnHover": 2
} }
@ -2341,11 +2343,13 @@ Module {
Property { name: "closeClickListener"; type: "QVariant" } Property { name: "closeClickListener"; type: "QVariant" }
Property { name: "stayTopClickListener"; type: "QVariant" } Property { name: "stayTopClickListener"; type: "QVariant" }
Property { name: "darkClickListener"; type: "QVariant" } Property { name: "darkClickListener"; type: "QVariant" }
Property { name: "systemMenuListener"; type: "QVariant" }
Method { name: "stayTopButton"; type: "QVariant" } Method { name: "stayTopButton"; type: "QVariant" }
Method { name: "minimizeButton"; type: "QVariant" } Method { name: "minimizeButton"; type: "QVariant" }
Method { name: "maximizeButton"; type: "QVariant" } Method { name: "maximizeButton"; type: "QVariant" }
Method { name: "closeButton"; type: "QVariant" } Method { name: "closeButton"; type: "QVariant" }
Method { name: "darkButton"; type: "QVariant" } Method { name: "darkButton"; type: "QVariant" }
Method { name: "maximizeButtonHover"; type: "QVariant" }
} }
Component { Component {
prototype: "QQuickRectangle" prototype: "QQuickRectangle"
@ -3013,15 +3017,15 @@ Module {
defaultProperty: "data" defaultProperty: "data"
Property { name: "logo"; type: "QUrl" } Property { name: "logo"; type: "QUrl" }
Property { name: "title"; type: "string" } Property { name: "title"; type: "string" }
Property { name: "items"; type: "FluObject_QMLTYPE_125"; isPointer: true } Property { name: "items"; type: "FluObject_QMLTYPE_157"; isPointer: true }
Property { name: "footerItems"; type: "FluObject_QMLTYPE_125"; isPointer: true } Property { name: "footerItems"; type: "FluObject_QMLTYPE_157"; isPointer: true }
Property { name: "displayMode"; type: "int" } Property { name: "displayMode"; type: "int" }
Property { name: "autoSuggestBox"; type: "QQmlComponent"; isPointer: true } Property { name: "autoSuggestBox"; type: "QQmlComponent"; isPointer: true }
Property { name: "actionItem"; type: "QQmlComponent"; isPointer: true } Property { name: "actionItem"; type: "QQmlComponent"; isPointer: true }
Property { name: "topPadding"; type: "int" } Property { name: "topPadding"; type: "int" }
Property { name: "pageMode"; type: "int" } Property { name: "pageMode"; type: "int" }
Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_34"; isPointer: true } Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_45"; isPointer: true }
Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_34"; isPointer: true } Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_45"; isPointer: true }
Property { name: "navCompactWidth"; type: "int" } Property { name: "navCompactWidth"; type: "int" }
Property { name: "navTopMargin"; type: "int" } Property { name: "navTopMargin"; type: "int" }
Property { name: "cellHeight"; type: "int" } Property { name: "cellHeight"; type: "int" }
@ -3109,21 +3113,17 @@ Module {
Property { name: "_ext"; type: "QVariant" } Property { name: "_ext"; type: "QVariant" }
Property { name: "_parent"; type: "QVariant" } Property { name: "_parent"; type: "QVariant" }
Property { name: "title"; type: "string" } Property { name: "title"; type: "string" }
Property { name: "order"; type: "int" }
Property { name: "url"; type: "QVariant" } Property { name: "url"; type: "QVariant" }
Property { name: "disabled"; type: "bool" } Property { name: "disabled"; type: "bool" }
Property { name: "icon"; type: "int" } Property { name: "icon"; type: "int" }
Property { name: "iconVisible"; type: "bool" } Property { name: "iconVisible"; type: "bool" }
Property { name: "infoBadge"; type: "QQmlComponent"; isPointer: true } Property { name: "infoBadge"; type: "QQmlComponent"; isPointer: true }
Property { name: "recentlyAdded"; type: "bool" }
Property { name: "recentlyUpdated"; type: "bool" }
Property { name: "desc"; type: "string" }
Property { name: "image"; type: "QVariant" }
Property { name: "count"; type: "int" } Property { name: "count"; type: "int" }
Property { name: "onTapListener"; type: "QVariant" } Property { name: "onTapListener"; type: "QVariant" }
Property { name: "iconDelegate"; type: "QQmlComponent"; isPointer: true } Property { name: "iconDelegate"; type: "QQmlComponent"; isPointer: true }
Property { name: "menuDelegate"; type: "QQmlComponent"; isPointer: true } Property { name: "menuDelegate"; type: "QQmlComponent"; isPointer: true }
Property { name: "editDelegate"; type: "QQmlComponent"; isPointer: true } Property { name: "editDelegate"; type: "QQmlComponent"; isPointer: true }
Property { name: "extra"; type: "QVariant" }
Property { name: "showEdit"; type: "bool" } Property { name: "showEdit"; type: "bool" }
Signal { name: "tap" } Signal { name: "tap" }
} }
@ -3534,13 +3534,6 @@ Module {
} }
Method { name: "count"; type: "QVariant" } Method { name: "count"; type: "QVariant" }
} }
Component {
prototype: "QQmlTableModelColumn"
name: "FluentUI/FluTableModelColumn 1.0"
exports: ["FluentUI/FluTableModelColumn 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
}
Component { Component {
prototype: "QQuickRectangle" prototype: "QQuickRectangle"
name: "FluentUI/FluTableView 1.0" name: "FluentUI/FluTableView 1.0"
@ -3798,7 +3791,15 @@ Module {
Property { name: "resizeBorderColor"; type: "QColor" } Property { name: "resizeBorderColor"; type: "QColor" }
Property { name: "resizeBorderWidth"; type: "int" } Property { name: "resizeBorderWidth"; type: "int" }
Property { name: "closeListener"; type: "QVariant" } Property { name: "closeListener"; type: "QVariant" }
Property { name: "_offsetXY"; type: "QPointF" }
Property { name: "_originalPos"; type: "QVariant" }
Property { name: "_accentColor"; type: "QColor" }
Property { name: "_realHeight"; type: "int" }
Property { name: "_realWidth"; type: "int" }
Property { name: "_appBarHeight"; type: "int" }
Property { name: "_enableMarginsBottomLeftRight"; type: "bool" }
Property { name: "content"; type: "QObject"; isList: true; isReadonly: true } Property { name: "content"; type: "QObject"; isList: true; isReadonly: true }
Signal { name: "showSystemMenu" }
Signal { Signal {
name: "initArgument" name: "initArgument"
Parameter { name: "argument"; type: "QVariant" } Parameter { name: "argument"; type: "QVariant" }
@ -3846,12 +3847,14 @@ Module {
Parameter { name: "path"; type: "QVariant" } Parameter { name: "path"; type: "QVariant" }
} }
Method { name: "moveWindowToDesktopCenter"; type: "QVariant" } Method { name: "moveWindowToDesktopCenter"; type: "QVariant" }
Method { name: "fixWindowSize"; type: "QVariant" }
Method { Method {
name: "onResult" name: "onResult"
type: "QVariant" type: "QVariant"
Parameter { name: "data"; type: "QVariant" } Parameter { name: "data"; type: "QVariant" }
} }
Method { name: "containerItem"; type: "QVariant" } Method { name: "layoutContainer"; type: "QVariant" }
Method { name: "layoutContent"; type: "QVariant" }
} }
Component { Component {
prototype: "QQuickRow" prototype: "QQuickRow"

1
src/Qt6/imports/FluentUI/Controls/FluAppBar.qml
View File

@ -44,6 +44,7 @@ Rectangle{
d.win.visibility = Window.Windowed d.win.visibility = Window.Windowed
else else
d.win.visibility = Window.Maximized d.win.visibility = Window.Maximized
d.hoverMaxBtn = false
} }
} }
property var minClickListener: function(){ property var minClickListener: function(){

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

@ -236,7 +236,7 @@ Item {
width: visible ? 24 : 0 width: visible ? 24 : 0
height: 24 height: 24
visible: { visible: {
if(closeButtonVisibility === FluTabViewType.Nerver) if(closeButtonVisibility === FluTabViewType.Never)
return false return false
if(closeButtonVisibility === FluTabViewType.OnHover) if(closeButtonVisibility === FluTabViewType.OnHover)
return item_mouse_hove.containsMouse || item_btn_close.hovered return item_mouse_hove.containsMouse || item_btn_close.hovered