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

update

Browse Source
This commit is contained in:
zhuzichu
2023-09-08 17:39:10 +08:00
parent e1292966c1
commit 752fe8cfba
10 changed files with 294 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/FluCaptcha.cpp
View File

@ -8,7 +8,10 @@
FluCaptcha::FluCaptcha(QQuickItem *parent)
: QQuickPaintedItem(parent)
{
font(QFont("楷体",25,QFont::Bold,true));
QFont fontStype;
fontStype.setPixelSize(28);
fontStype.setBold(true);
font(fontStype);
setWidth(180);
setHeight(80);
refresh();

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

@ -10,7 +10,7 @@ Canvas {
property var chartOptions
property double chartAnimationProgress: 0.1
property int animationEasingType: Easing.InOutExpo
property double animationDuration: 500
property double animationDuration: 0
property var memorizedContext
property var memorizedData
property var memorizedOptions
@ -22,6 +22,7 @@ Canvas {
jsChart.update();
chartAnimator.restart();
}
opacity:
MouseArea {
id: event
anchors.fill: control

130
src/Qt5/imports/FluentUI/Controls/FluScrollBar.qml
View File

@ -13,18 +13,115 @@ T.ScrollBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
padding: 2
visible: control.policy !== T.ScrollBar.AlwaysOff
minimumSize: Math.max(orientation === Qt.Horizontal ? height / width : width / height,0.3)
QtObject{
id:d
property int minLine : 2
property int maxLine : 6
}
verticalPadding : vertical ? 15 : 2
horizontalPadding : horizontal ? 15 : 2
background: Rectangle{
id:back_rect
radius: 5
color:FluTheme.dark ? Qt.rgba(44/255,44/255,44/255,1) : Qt.rgba(255/255,255/255,255/255,1)
opacity:{
if(vertical){
return d.maxLine === Number(rect_bar.width)
}
return d.maxLine === Number(rect_bar.height)
}
Behavior on opacity {
NumberAnimation{
duration: 167
}
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
verticalPadding: 0
horizontalPadding: 0
visible: control.horizontal
opacity: back_rect.opacity
anchors{
left: parent.left
leftMargin: 4
verticalCenter: parent.verticalCenter
}
iconColor: control.color
iconSource: FluentIcons.CaretLeftSolid8
onClicked: {
control.decrease()
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
right: parent.right
rightMargin: 4
verticalCenter: parent.verticalCenter
}
visible: control.horizontal
iconSource: FluentIcons.CaretRightSolid8
onClicked: {
control.increase()
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
top: parent.top
topMargin: 4
horizontalCenter: parent.horizontalCenter
}
visible: control.vertical
iconSource: FluentIcons.CaretUpSolid8
onClicked: {
control.decrease()
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
bottom: parent.bottom
bottomMargin: 4
horizontalCenter: parent.horizontalCenter
}
visible: control.vertical
iconSource: FluentIcons.CaretDownSolid8
onClicked: {
control.increase()
}
}
contentItem: Item {
property bool collapsed: (control.policy === T.ScrollBar.AlwaysOn || (control.active && control.size < 1.0))
implicitWidth: control.interactive ? 6 : 2
implicitHeight: control.interactive ? 6 : 2
implicitWidth: control.interactive ? d.maxLine : d.minLine
implicitHeight: control.interactive ? d.maxLine : d.minLine
Rectangle{
id:rect_bar
width: vertical ? 2 : parent.width
height: horizontal ? 2 : parent.height
width: vertical ? d.minLine : parent.width
height: horizontal ? d.minLine : parent.height
color:{
if(control.pressed){
return control.pressedColor
@ -44,8 +141,8 @@ T.ScrollBar {
when: contentItem.collapsed
PropertyChanges {
target: rect_bar
width: vertical ? 6 : parent.width
height: horizontal ? 6 : parent.height
width: vertical ? d.maxLine : parent.width
height: horizontal ? d.maxLine : parent.height
}
}
,State{
@ -53,8 +150,8 @@ T.ScrollBar {
when: !contentItem.collapsed
PropertyChanges {
target: rect_bar
width: vertical ? 2 : parent.width
height: horizontal ? 2 : parent.height
width: vertical ? d.minLine : parent.width
height: horizontal ? d.minLine : parent.height
}
}
]
@ -73,11 +170,14 @@ T.ScrollBar {
}
,Transition {
to: "show"
NumberAnimation {
target: rect_bar
properties: vertical ? "width" : "height"
duration: 167
easing.type: Easing.OutCubic
SequentialAnimation {
PauseAnimation { duration: 450 }
NumberAnimation {
target: rect_bar
properties: vertical ? "width" : "height"
duration: 167
easing.type: Easing.OutCubic
}
}
}
]

9
src/Qt5/imports/FluentUI/Controls/FluTextBoxMenu.qml
View File

@ -31,7 +31,7 @@ FluMenu{
text:cutText
focus: false
padding: 0
height: visible ? 34 : 0
height: visible ? 36 : 0
visible: inputItem.selectedText !== "" && !inputItem.readOnly
onClicked: {
inputItem.cut()
@ -43,7 +43,7 @@ FluMenu{
text:copyText
focus: false
padding: 0
height: visible ? 34 : 0
height: visible ? 36 : 0
visible: inputItem.selectedText !== ""
onClicked: {
inputItem.copy()
@ -55,8 +55,7 @@ FluMenu{
text:pasteText
focus: false
padding: 0
height: visible ? 34 : 0
visible: inputItem.canPaste
height: visible ? 36 : 0
onClicked: {
inputItem.paste()
menu.close()
@ -67,7 +66,7 @@ FluMenu{
text:selectAllText
focus: false
padding: 0
height: visible ? 34 : 0
height: visible ? 36 : 0
visible: inputItem.text !== ""
onClicked: {
inputItem.selectAll()

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

@ -10,7 +10,7 @@ Canvas {
property var chartOptions
property double chartAnimationProgress: 0.1
property int animationEasingType: Easing.InOutExpo
property double animationDuration: 500
property double animationDuration: 0
property var memorizedContext
property var memorizedData
property var memorizedOptions

130
src/Qt6/imports/FluentUI/Controls/FluScrollBar.qml
View File

@ -14,18 +14,115 @@ T.ScrollBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
padding: 2
visible: control.policy !== T.ScrollBar.AlwaysOff
minimumSize: Math.max(orientation === Qt.Horizontal ? height / width : width / height,0.3)
QtObject{
id:d
property int minLine : 2
property int maxLine : 6
}
verticalPadding : vertical ? 15 : 2
horizontalPadding : horizontal ? 15 : 2
background: Rectangle{
id:back_rect
radius: 5
color:FluTheme.dark ? Qt.rgba(44/255,44/255,44/255,1) : Qt.rgba(255/255,255/255,255/255,1)
opacity:{
if(vertical){
return d.maxLine === Number(rect_bar.width)
}
return d.maxLine === Number(rect_bar.height)
}
Behavior on opacity {
NumberAnimation{
duration: 167
}
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
verticalPadding: 0
horizontalPadding: 0
visible: control.horizontal
opacity: back_rect.opacity
anchors{
left: parent.left
leftMargin: 4
verticalCenter: parent.verticalCenter
}
iconColor: control.color
iconSource: FluentIcons.CaretLeftSolid8
onClicked: {
control.decrease()
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
right: parent.right
rightMargin: 4
verticalCenter: parent.verticalCenter
}
visible: control.horizontal
iconSource: FluentIcons.CaretRightSolid8
onClicked: {
control.increase()
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
top: parent.top
topMargin: 4
horizontalCenter: parent.horizontalCenter
}
visible: control.vertical
iconSource: FluentIcons.CaretUpSolid8
onClicked: {
control.decrease()
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
bottom: parent.bottom
bottomMargin: 4
horizontalCenter: parent.horizontalCenter
}
visible: control.vertical
iconSource: FluentIcons.CaretDownSolid8
onClicked: {
control.increase()
}
}
contentItem: Item {
property bool collapsed: (control.policy === T.ScrollBar.AlwaysOn || (control.active && control.size < 1.0))
implicitWidth: control.interactive ? 6 : 2
implicitHeight: control.interactive ? 6 : 2
implicitWidth: control.interactive ? d.maxLine : d.minLine
implicitHeight: control.interactive ? d.maxLine : d.minLine
Rectangle{
id:rect_bar
width: vertical ? 2 : parent.width
height: horizontal ? 2 : parent.height
width: vertical ? d.minLine : parent.width
height: horizontal ? d.minLine : parent.height
color:{
if(control.pressed){
return control.pressedColor
@ -45,8 +142,8 @@ T.ScrollBar {
when: contentItem.collapsed
PropertyChanges {
target: rect_bar
width: vertical ? 6 : parent.width
height: horizontal ? 6 : parent.height
width: vertical ? d.maxLine : parent.width
height: horizontal ? d.maxLine : parent.height
}
}
,State{
@ -54,8 +151,8 @@ T.ScrollBar {
when: !contentItem.collapsed
PropertyChanges {
target: rect_bar
width: vertical ? 2 : parent.width
height: horizontal ? 2 : parent.height
width: vertical ? d.minLine : parent.width
height: horizontal ? d.minLine : parent.height
}
}
]
@ -74,11 +171,14 @@ T.ScrollBar {
}
,Transition {
to: "show"
NumberAnimation {
target: rect_bar
properties: vertical ? "width" : "height"
duration: 167
easing.type: Easing.OutCubic
SequentialAnimation {
PauseAnimation { duration: 450 }
NumberAnimation {
target: rect_bar
properties: vertical ? "width" : "height"
duration: 167
easing.type: Easing.OutCubic
}
}
}
]

9
src/Qt6/imports/FluentUI/Controls/FluTextBoxMenu.qml
View File

@ -31,7 +31,7 @@ FluMenu{
text:cutText
focus: false
padding: 0
height: visible ? 34 : 0
height: visible ? 36 : 0
visible: inputItem.selectedText !== "" && !inputItem.readOnly
onClicked: {
inputItem.cut()
@ -43,7 +43,7 @@ FluMenu{
text:copyText
focus: false
padding: 0
height: visible ? 34 : 0
height: visible ? 36 : 0
visible: inputItem.selectedText !== ""
onClicked: {
inputItem.copy()
@ -55,8 +55,7 @@ FluMenu{
text:pasteText
focus: false
padding: 0
height: visible ? 34 : 0
visible: inputItem.canPaste
height: visible ? 36 : 0
onClicked: {
inputItem.paste()
menu.close()
@ -67,7 +66,7 @@ FluMenu{
text:selectAllText
focus: false
padding: 0
height: visible ? 34 : 0
height: visible ? 36 : 0
visible: inputItem.text !== ""
onClicked: {
inputItem.selectAll()