mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2025-02-11 09:10:01 +08:00
Compare commits
No commits in common. "a9ceff8f6f1680e0a53e18c795f5ba1f66ad7cc6" and "875bba2bd6a4d3c1a09c8c5c904a07036f927043" have entirely different histories.
a9ceff8f6f
...
875bba2bd6
@ -1,6 +1,3 @@
|
||||
# ATTENTION! THIS REPO HAS BEEN DEPRECATED!
|
||||
# PLEASE USE THE BRAND NEW [FluentUI2](https://github.com/zhuzichu520/FluentUI2) INSTEAD!
|
||||
# THIS REPO IS NO LONGER MAINTAINED.
|
||||
<div align=center>
|
||||
<img width=64 src="doc/preview/fluent_design.svg">
|
||||
|
||||
|
||||
@ -15,9 +15,7 @@ Canvas {
|
||||
function animateToNewData()
|
||||
{
|
||||
chartAnimationProgress = 0.1;
|
||||
if (d.jsChart) {
|
||||
d.jsChart.update();
|
||||
}
|
||||
chartAnimator.restart();
|
||||
}
|
||||
QtObject{
|
||||
|
||||
@ -107,7 +107,7 @@ T.ComboBox {
|
||||
y: control.height
|
||||
width: control.width
|
||||
height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
|
||||
topMargin: 32
|
||||
topMargin: 6
|
||||
bottomMargin: 6
|
||||
modal: true
|
||||
contentItem: ListView {
|
||||
|
||||
@ -41,7 +41,7 @@ FluPopup {
|
||||
FluText{
|
||||
id:text_message
|
||||
font: FluTextStyle.Body
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
text:message
|
||||
width: parent.width
|
||||
topPadding: 4
|
||||
@ -67,7 +67,7 @@ FluPopup {
|
||||
topPadding: 20
|
||||
leftPadding: 20
|
||||
rightPadding: 20
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
}
|
||||
FluLoader{
|
||||
sourceComponent: com_message
|
||||
|
||||
@ -190,13 +190,13 @@ FluObject {
|
||||
spacing: 5
|
||||
FluText{
|
||||
text:_super.text
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
width: Math.min(implicitWidth,mcontrol.maxWidth)
|
||||
}
|
||||
FluText{
|
||||
text: _super.moremsg
|
||||
visible: _super.moremsg
|
||||
wrapMode : Text.WordWrap
|
||||
wrapMode : Text.WrapAnywhere
|
||||
textColor: FluColors.Grey120
|
||||
width: Math.min(implicitWidth,mcontrol.maxWidth)
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@ TextArea{
|
||||
return normalColor
|
||||
}
|
||||
font:FluTextStyle.Body
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
padding: 8
|
||||
leftPadding: padding+4
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
|
||||
@ -41,18 +41,16 @@ ProgressBar{
|
||||
height: parent.height
|
||||
radius: d._radius
|
||||
color: control.color
|
||||
SequentialAnimation on x {
|
||||
PropertyAnimation on x {
|
||||
id:animator_x
|
||||
running: control.indeterminate && control.visible
|
||||
loops: Animation.Infinite
|
||||
PropertyAnimation {
|
||||
from: -rect_progress.width
|
||||
to:control.width+rect_progress.width
|
||||
loops: Animation.Infinite
|
||||
duration: control.duration
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
FluText{
|
||||
text:(control.visualPosition * 100).toFixed(0) + "%"
|
||||
visible: {
|
||||
|
||||
@ -5,11 +5,8 @@ import QtQuick.Controls 2.15
|
||||
import FluentUI 1.0
|
||||
|
||||
FluPage {
|
||||
property bool autoResetScroll: false
|
||||
default property alias content: container.data
|
||||
|
||||
Flickable{
|
||||
id: flickable
|
||||
clip: true
|
||||
anchors.fill: parent
|
||||
ScrollBar.vertical: FluScrollBar {}
|
||||
@ -20,14 +17,4 @@ FluPage {
|
||||
width: parent.width
|
||||
}
|
||||
}
|
||||
|
||||
function resetScroll() {
|
||||
flickable.contentY = 0;
|
||||
}
|
||||
|
||||
StackView.onActivated: {
|
||||
if (autoResetScroll) {
|
||||
resetScroll(); // Call this function to reset the scroll position to the top
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -98,7 +98,7 @@ Item{
|
||||
Component{
|
||||
id:com_lable
|
||||
FluText{
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
|
||||
text: {
|
||||
if(modelData.lable){
|
||||
@ -113,7 +113,7 @@ Item{
|
||||
Component{
|
||||
id:com_text
|
||||
FluText{
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
|
||||
text: modelData.text
|
||||
textFormat: Text.RichText
|
||||
|
||||
@ -175,7 +175,7 @@ Popup{
|
||||
FluText{
|
||||
id: text_desc
|
||||
font: FluTextStyle.Body
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
maximumLineCount: 4
|
||||
elide: Text.ElideRight
|
||||
text: {
|
||||
|
||||
@ -14,9 +14,7 @@ Canvas {
|
||||
function animateToNewData()
|
||||
{
|
||||
chartAnimationProgress = 0.1;
|
||||
if (d.jsChart) {
|
||||
d.jsChart.update();
|
||||
}
|
||||
chartAnimator.restart();
|
||||
}
|
||||
QtObject{
|
||||
|
||||
@ -107,7 +107,7 @@ T.ComboBox {
|
||||
y: control.height
|
||||
width: control.width
|
||||
height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
|
||||
topMargin: 32
|
||||
topMargin: 6
|
||||
bottomMargin: 6
|
||||
modal: true
|
||||
contentItem: ListView {
|
||||
|
||||
@ -41,7 +41,7 @@ FluPopup {
|
||||
FluText{
|
||||
id:text_message
|
||||
font: FluTextStyle.Body
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
text:message
|
||||
width: parent.width
|
||||
topPadding: 4
|
||||
@ -67,7 +67,7 @@ FluPopup {
|
||||
topPadding: 20
|
||||
leftPadding: 20
|
||||
rightPadding: 20
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
}
|
||||
FluLoader{
|
||||
sourceComponent: com_message
|
||||
|
||||
@ -190,13 +190,13 @@ FluObject {
|
||||
spacing: 5
|
||||
FluText{
|
||||
text:_super.text
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
width: Math.min(implicitWidth,mcontrol.maxWidth)
|
||||
}
|
||||
FluText{
|
||||
text: _super.moremsg
|
||||
visible: _super.moremsg
|
||||
wrapMode : Text.WordWrap
|
||||
wrapMode : Text.WrapAnywhere
|
||||
textColor: FluColors.Grey120
|
||||
width: Math.min(implicitWidth,mcontrol.maxWidth)
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ TextArea{
|
||||
return normalColor
|
||||
}
|
||||
font:FluTextStyle.Body
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
padding: 8
|
||||
leftPadding: padding+4
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
|
||||
@ -42,18 +42,16 @@ ProgressBar{
|
||||
height: parent.height
|
||||
radius: d._radius
|
||||
color: control.color
|
||||
SequentialAnimation on x {
|
||||
PropertyAnimation on x {
|
||||
id:animator_x
|
||||
running: control.indeterminate && control.visible
|
||||
loops: Animation.Infinite
|
||||
PropertyAnimation {
|
||||
from: -rect_progress.width
|
||||
to:control.width+rect_progress.width
|
||||
loops: Animation.Infinite
|
||||
duration: control.duration
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
FluText{
|
||||
text:(control.visualPosition * 100).toFixed(0) + "%"
|
||||
visible: {
|
||||
|
||||
@ -5,11 +5,8 @@ import QtQuick.Controls
|
||||
import FluentUI
|
||||
|
||||
FluPage {
|
||||
property bool autoResetScroll: false
|
||||
default property alias content: container.data
|
||||
|
||||
Flickable{
|
||||
id: flickable
|
||||
clip: true
|
||||
anchors.fill: parent
|
||||
ScrollBar.vertical: FluScrollBar {}
|
||||
@ -20,14 +17,4 @@ FluPage {
|
||||
width: parent.width
|
||||
}
|
||||
}
|
||||
|
||||
function resetScroll() {
|
||||
flickable.contentY = 0;
|
||||
}
|
||||
|
||||
StackView.onActivated: {
|
||||
if (autoResetScroll) {
|
||||
resetScroll(); // Call this function to reset the scroll position to the top
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -98,7 +98,7 @@ Item{
|
||||
Component{
|
||||
id:com_lable
|
||||
FluText{
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
|
||||
text: {
|
||||
if(modelData.lable){
|
||||
@ -113,7 +113,7 @@ Item{
|
||||
Component{
|
||||
id:com_text
|
||||
FluText{
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
|
||||
text: modelData.text
|
||||
textFormat: Text.RichText
|
||||
|
||||
@ -175,7 +175,7 @@ Popup{
|
||||
FluText{
|
||||
id: text_desc
|
||||
font: FluTextStyle.Body
|
||||
wrapMode: Text.WordWrap
|
||||
wrapMode: Text.WrapAnywhere
|
||||
maximumLineCount: 4
|
||||
elide: Text.ElideRight
|
||||
text: {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user