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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi
2023-09-08 22:33:23 +08:00
parent 4b01fcf2b4
commit 24f3cb1027
24 changed files with 207 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@ Rectangle {
radius: 4
border.width: 1
border.color: dividerColor
Component.onCompleted: {
if(current){
const date = current
@ -33,7 +32,6 @@ Rectangle {
text_date.text = year+"-"+(month+1)+"-"+day
}
}
MouseArea{
id:mouse_area
hoverEnabled: true

6
src/Qt5/imports/FluentUI/Controls/FluCalendarView.qml
View File

@ -7,6 +7,7 @@ Item {
property var date: new Date()
property var currentDate : new Date()
property var toDay: new Date()
property int radius: 5
signal dateClicked(var date)
id:control
width: 280
@ -214,10 +215,7 @@ Item {
}
FluArea{
anchors.fill: parent
radius: 5
FluShadow{
radius: 5
}
radius: control.radius
Rectangle{
id:layout_divider
height: 1

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

@ -22,7 +22,6 @@ Canvas {
jsChart.update();
chartAnimator.restart();
}
opacity:
MouseArea {
id: event
anchors.fill: control
@ -90,7 +89,7 @@ Canvas {
control.requestPaint();
}
onPaint: {
if(control.getContext('2d') !== null && memorizedContext !== control.getContext('2d') || memorizedData !== control.chartData || memorizedOptions !== control.chartOptions) {
if(control.getContext('2d') !== null && memorizedContext !== control.getContext('2d') || memorizedData !== control.chartData || memorizedOptions !== control.chartOptions) {
var ctx = control.getContext('2d');
jsChart = Chart.build(ctx, {

7
src/Qt5/imports/FluentUI/Controls/FluColorView.qml
View File

@ -4,15 +4,14 @@ import FluentUI 1.0
import "ColorPicker"
Item {
id:control
property alias colorValue: color_picker.colorValue
property int radius: 5
width: color_picker.width+10
height: color_picker.height
FluArea{
anchors.fill: parent
radius: 5
FluShadow{
radius: 5
}
radius: control.radius
ColorPicker{
id:color_picker
}

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

@ -20,12 +20,12 @@ T.ScrollBar {
property int minLine : 2
property int maxLine : 6
}
verticalPadding : vertical ? 15 : 2
horizontalPadding : horizontal ? 15 : 2
verticalPadding : vertical ? 15 : 3
horizontalPadding : horizontal ? 15 : 3
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)
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)
@ -34,21 +34,21 @@ T.ScrollBar {
}
Behavior on opacity {
NumberAnimation{
duration: 167
duration: 50
}
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
width: 12
height: 12
iconSize: 8
verticalPadding: 0
horizontalPadding: 0
visible: control.horizontal
opacity: back_rect.opacity
anchors{
left: parent.left
leftMargin: 4
leftMargin: 2
verticalCenter: parent.verticalCenter
}
iconColor: control.color
@ -58,16 +58,16 @@ T.ScrollBar {
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
width: 12
height: 12
iconSize: 8
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
right: parent.right
rightMargin: 4
rightMargin: 2
verticalCenter: parent.verticalCenter
}
visible: control.horizontal
@ -77,16 +77,16 @@ T.ScrollBar {
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
width: 12
height: 12
iconSize: 8
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
top: parent.top
topMargin: 4
topMargin: 2
horizontalCenter: parent.horizontalCenter
}
visible: control.vertical
@ -96,16 +96,16 @@ T.ScrollBar {
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
width: 12
height: 12
iconSize: 8
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
bottom: parent.bottom
bottomMargin: 4
bottomMargin: 2
horizontalCenter: parent.horizontalCenter
}
visible: control.vertical

10
src/Qt5/imports/FluentUI/Controls/FluShadow.qml
View File

@ -4,8 +4,8 @@ import FluentUI 1.0
Item {
//高性能阴影！！！比DropShadow阴影性能高出数倍！！！
property color color: FluTheme.dark ? "#999999" : "#999999"
property int elevation: 5
property color color: FluTheme.dark ? "#FFFFFF" : "#999999"
property int elevation: 6
property int radius: 4
id:control
anchors.fill: parent
@ -14,9 +14,9 @@ Item {
Rectangle{
anchors.fill: parent
color: "#00000000"
opacity: 0.02 * (elevation-index+1)
anchors.margins: -index+1
radius: control.radius
opacity: 0.01 * (elevation-index+1)
anchors.margins: -index
radius: control.radius+index
border.width: index
border.color: control.color
}

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

@ -23,7 +23,6 @@ Rectangle {
radius: 4
border.width: 1
border.color: dividerColor
Component.onCompleted: {
if(current){
const date = current
@ -33,7 +32,6 @@ Rectangle {
text_date.text = year+"-"+(month+1)+"-"+day
}
}
MouseArea{
id:mouse_area
hoverEnabled: true

6
src/Qt6/imports/FluentUI/Controls/FluCalendarView.qml
View File

@ -7,6 +7,7 @@ Item {
property var date: new Date()
property var currentDate : new Date()
property var toDay: new Date()
property int radius: 5
signal dateClicked(var date)
id:control
width: 280
@ -214,10 +215,7 @@ Item {
}
FluArea{
anchors.fill: parent
radius: 5
FluShadow{
radius: 5
}
radius: control.radius
Rectangle{
id:layout_divider
height: 1

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

@ -1,4 +1,4 @@
import QtQuick 2.13
import QtQuick
import "./../JS/Chart.js" as Chart
Canvas {

7
src/Qt6/imports/FluentUI/Controls/FluColorView.qml
View File

@ -4,15 +4,14 @@ import FluentUI
import "ColorPicker"
Item {
id:control
property alias colorValue: color_picker.colorValue
property int radius: 5
width: color_picker.width+10
height: color_picker.height
FluArea{
anchors.fill: parent
radius: 5
FluShadow{
radius: 5
}
radius: control.radius
ColorPicker{
id:color_picker
}

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

@ -21,12 +21,12 @@ T.ScrollBar {
property int minLine : 2
property int maxLine : 6
}
verticalPadding : vertical ? 15 : 2
horizontalPadding : horizontal ? 15 : 2
verticalPadding : vertical ? 15 : 3
horizontalPadding : horizontal ? 15 : 3
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)
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)
@ -35,21 +35,21 @@ T.ScrollBar {
}
Behavior on opacity {
NumberAnimation{
duration: 167
duration: 50
}
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
width: 12
height: 12
iconSize: 8
verticalPadding: 0
horizontalPadding: 0
visible: control.horizontal
opacity: back_rect.opacity
anchors{
left: parent.left
leftMargin: 4
leftMargin: 2
verticalCenter: parent.verticalCenter
}
iconColor: control.color
@ -59,16 +59,16 @@ T.ScrollBar {
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
width: 12
height: 12
iconSize: 8
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
right: parent.right
rightMargin: 4
rightMargin: 2
verticalCenter: parent.verticalCenter
}
visible: control.horizontal
@ -78,16 +78,16 @@ T.ScrollBar {
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
width: 12
height: 12
iconSize: 8
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
top: parent.top
topMargin: 4
topMargin: 2
horizontalCenter: parent.horizontalCenter
}
visible: control.vertical
@ -97,16 +97,16 @@ T.ScrollBar {
}
}
FluIconButton{
width: 10
height: 10
iconSize: 6
width: 12
height: 12
iconSize: 8
verticalPadding: 0
horizontalPadding: 0
iconColor: control.color
opacity: back_rect.opacity
anchors{
bottom: parent.bottom
bottomMargin: 4
bottomMargin: 2
horizontalCenter: parent.horizontalCenter
}
visible: control.vertical

10
src/Qt6/imports/FluentUI/Controls/FluShadow.qml
View File

@ -4,8 +4,8 @@ import FluentUI
Item {
//高性能阴影！！！比DropShadow阴影性能高出数倍！！！
property color color: FluTheme.dark ? "#999999" : "#999999"
property int elevation: 5
property color color: FluTheme.dark ? "#FFFFFF" : "#999999"
property int elevation: 6
property int radius: 4
id:control
anchors.fill: parent
@ -14,9 +14,9 @@ Item {
Rectangle{
anchors.fill: parent
color: "#00000000"
opacity: 0.02 * (elevation-index+1)
anchors.margins: -index+1
radius: control.radius
opacity: 0.01 * (elevation-index+1)
anchors.margins: -index
radius: control.radius+index
border.width: index
border.color: control.color
}