wuyize
/
FluentUI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

main
zhuzihcu 2023-04-19 18:04:14 +08:00
parent 6dd859dd1d
commit 7489a4bcbe
6 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
example/T_TableView.qml
View File

@ -110,7 +110,6 @@ FluScrollablePage{
id:table_view id:table_view
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
width:parent.width
pageCurrent:1 pageCurrent:1
pageCount:10 pageCount:10
itemCount: 1000 itemCount: 1000

11
src/FluTheme.cpp
View File

@ -19,15 +19,6 @@ FluTheme::FluTheme(QObject *parent)
{ {
primaryColor(FluColors::getInstance()->Blue()); primaryColor(FluColors::getInstance()->Blue());
textSize(13); textSize(13);
nativeText(true); nativeText(false);
frameless(true); frameless(true);
std::function<bool()> isDark = [](){
QPalette palette = (qobject_cast<QGuiApplication *>(QCoreApplication::instance()))->palette();
QColor color = palette.color(QPalette::Window).rgb();
return !(color.red() * 0.2126 + color.green() * 0.7152 + color.blue() * 0.0722 > 255 / 2);
};
dark(isDark());
connect(qobject_cast<QGuiApplication *>(QCoreApplication::instance()), &QGuiApplication::paletteChanged, this, [=] (const QPalette &) {
dark(isDark());
});
} }

2
src/controls/FluExpander.qml
View File

@ -86,7 +86,7 @@ Item {
Behavior on height { Behavior on height {
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: expand ? [ 0, 0, 0, 1 ] : [ 1, 0, 0, 0 ] easing.bezierCurve: expand ? [ 0, 0, 0, 1 ] : [ 1, 0, 0, 0 ]
} }
} }

16
src/controls/FluNavigationView.qml
View File

@ -121,7 +121,7 @@ Item {
Behavior on height { Behavior on height {
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 0, 0, 0, 1 ] easing.bezierCurve: [ 0, 0, 0, 1 ]
} }
} }
@ -140,7 +140,7 @@ Item {
Behavior on height { Behavior on height {
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 0, 0, 0, 1 ] easing.bezierCurve: [ 0, 0, 0, 1 ]
} }
} }
@ -318,7 +318,7 @@ Item {
Behavior on height { Behavior on height {
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 0, 0, 0, 1 ] easing.bezierCurve: [ 0, 0, 0, 1 ]
} }
} }
@ -511,7 +511,7 @@ Item {
Behavior on Layout.preferredWidth{ Behavior on Layout.preferredWidth{
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 0, 0, 0, 1 ] easing.bezierCurve: [ 0, 0, 0, 1 ]
} }
} }
@ -557,7 +557,7 @@ Item {
from: 0 from: 0
to: nav_swipe.height to: nav_swipe.height
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 1, 0, 0, 0 ] easing.bezierCurve: [ 1, 0, 0, 0 ]
} }
} }
@ -567,7 +567,7 @@ Item {
from: nav_swipe.height; from: nav_swipe.height;
to: 0 to: 0
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 0, 0, 0, 1 ] easing.bezierCurve: [ 0, 0, 0, 1 ]
} }
} }
@ -596,7 +596,7 @@ Item {
Behavior on width{ Behavior on width{
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 0, 0, 0, 1 ] easing.bezierCurve: [ 0, 0, 0, 1 ]
} }
} }
@ -604,7 +604,7 @@ Item {
id:anim_layout_list_x id:anim_layout_list_x
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 0, 0, 0, 1 ] easing.bezierCurve: [ 0, 0, 0, 1 ]
} }
} }

16
src/controls/FluProgressRing.qml
View File

@ -39,7 +39,9 @@ Rectangle {
id:behavior id:behavior
enabled: false enabled: false
NumberAnimation{ NumberAnimation{
duration: 1000 duration: 999
easing.type: Easing.BezierSpline
easing.bezierCurve: [0.55,0.55,0,1]
onRunningChanged: { onRunningChanged: {
if(!running){ if(!running){
behavior.enabled = false behavior.enabled = false
@ -68,18 +70,6 @@ Rectangle {
ctx.arc(width/2, height/2, radius2 ,-0.5 * Math.PI,-0.5 * Math.PI + progress * 2 * Math.PI); ctx.arc(width/2, height/2, radius2 ,-0.5 * Math.PI,-0.5 * Math.PI + progress * 2 * Math.PI);
ctx.stroke(); ctx.stroke();
ctx.closePath(); ctx.closePath();
// var start_x = width/2 + Math.cos(-0.5 * Math.PI) * radius2;
// var start_y = height/2 + Math.sin(-0.5 * Math.PI) * radius2;
// ctx.beginPath();
// ctx.arc(start_x, start_y, 3, 0, 2*Math.PI);
// ctx.fill();
// ctx.closePath();
// var end_x = width/2 + Math.cos(-0.5 * Math.PI + progress * 2 * Math.PI) * radius2;
// var end_y = height/2 + Math.sin(-0.5 * Math.PI + progress * 2 * Math.PI) * radius2;
// ctx.beginPath();
// ctx.arc(end_x, end_y, 3, 0, 2*Math.PI);
// ctx.fill();
// ctx.closePath();
ctx.restore(); ctx.restore();
} }
} }

8
src/controls/FluToggleSwitch.qml
View File

@ -72,28 +72,28 @@ FluControl {
Behavior on anchors.leftMargin { Behavior on anchors.leftMargin {
NumberAnimation { NumberAnimation {
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 1, 0, 0, 0 ] easing.bezierCurve: [ 1, 0, 0, 0 ]
} }
} }
Behavior on anchors.rightMargin { Behavior on anchors.rightMargin {
NumberAnimation { NumberAnimation {
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 1, 0, 0, 0 ] easing.bezierCurve: [ 1, 0, 0, 0 ]
} }
} }
Behavior on width { Behavior on width {
NumberAnimation { NumberAnimation {
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 1, 0, 0, 0 ] easing.bezierCurve: [ 1, 0, 0, 0 ]
} }
} }
Behavior on scale { Behavior on scale {
NumberAnimation { NumberAnimation {
duration: 167 duration: 167
easing.type: Easing.Bezier easing.type: Easing.BezierSpline
easing.bezierCurve: [ 1, 0, 0, 0 ] easing.bezierCurve: [ 1, 0, 0, 0 ]
} }
} }