This commit is contained in:
zhuzichu
2023-11-02 15:33:59 +08:00
parent 20852ac6bf
commit 54b98c8e05
90 changed files with 308 additions and 445 deletions

View File

@ -77,7 +77,7 @@ FluScrollablePage{
Rectangle{
anchors.fill: parent
radius: 5
color:FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)
color:FluTheme.itemHoverColor
visible: item_mouse.containsMouse
}
Rectangle{
@ -172,17 +172,10 @@ FluScrollablePage{
anchors.fill: parent
radius: 8
color:{
if(FluTheme.dark){
if(item_mouse.containsMouse){
return Qt.rgba(1,1,1,0.03)
}
return Qt.rgba(0,0,0,0)
}else{
if(item_mouse.containsMouse){
return Qt.rgba(0,0,0,0.03)
}
return Qt.rgba(0,0,0,0)
if(item_mouse.containsMouse){
return FluTheme.itemHoverColor
}
return FluTheme.itemNormalColor
}
}
Image{
@ -227,7 +220,7 @@ FluScrollablePage{
height: 12
width: 12
radius: 6
color: FluTheme.primaryColor.dark
color: FluTheme.primaryColor
anchors{
right: parent.right
top: parent.top

View File

@ -35,7 +35,7 @@ FluScrollablePage{
color: FluTheme.dark ? FluColors.Black : FluColors.White
FluShadow{
radius: 4
color: FluTheme.primaryColor.dark
color: FluTheme.primaryColor
}
Image{
id:image

View File

@ -66,7 +66,7 @@ FluScrollablePage{
}
Rectangle {
anchors.fill: parent
color:FluTheme.primaryColor.dark
color:FluTheme.primaryColor
}
}
}
@ -78,7 +78,7 @@ FluScrollablePage{
statusMode: FluStatusViewType.Loading
Rectangle{
anchors.fill: parent
color:FluTheme.primaryColor.dark
color:FluTheme.primaryColor
}
}'
}

View File

@ -181,7 +181,7 @@ FluContentPage{
iconSource: FluentIcons.ChevronUp
iconColor: {
if(1 === root.sortType){
return FluTheme.primaryColor.dark
return FluTheme.primaryColor
}
return FluTheme.dark ? Qt.rgba(1,1,1,1) : Qt.rgba(0,0,0,1)
}
@ -202,7 +202,7 @@ FluContentPage{
iconSource: FluentIcons.ChevronDown
iconColor: {
if(2 === root.sortType){
return FluTheme.primaryColor.dark
return FluTheme.primaryColor
}
return FluTheme.dark ? Qt.rgba(1,1,1,1) : Qt.rgba(0,0,0,1)
}

View File

@ -32,7 +32,7 @@ FluScrollablePage{
anchors.centerIn: parent
iconSource: FluentIcons.AcceptMedium
iconSize: 15
visible: modelData === FluTheme.primaryColor
visible: modelData === FluTheme.themeColor
color: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
}
MouseArea{
@ -40,7 +40,7 @@ FluScrollablePage{
anchors.fill: parent
hoverEnabled: true
onClicked: {
FluTheme.primaryColor = modelData
FluTheme.themeColor = modelData
}
}
}
@ -88,7 +88,7 @@ FluScrollablePage{
CodeExpander{
Layout.fillWidth: true
Layout.topMargin: -1
code:'FluTheme.primaryColor = FluColors.Orange
code:'FluTheme.themeColor = FluColors.Orange
FluTheme.dark = true

View File

@ -2,7 +2,6 @@ import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import QtQuick.Controls 2.15
import QtGraphicalEffects 1.0
import "qrc:///example/qml/global"
import FluentUI 1.0
@ -78,7 +77,7 @@ FluScrollablePage{
Rectangle{
anchors.fill: parent
radius: 5
color:FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)
color:FluTheme.itemHoverColor
visible: item_mouse.containsMouse
}
Rectangle{
@ -173,17 +172,10 @@ FluScrollablePage{
anchors.fill: parent
radius: 8
color:{
if(FluTheme.dark){
if(item_mouse.containsMouse){
return Qt.rgba(1,1,1,0.03)
}
return Qt.rgba(0,0,0,0)
}else{
if(item_mouse.containsMouse){
return Qt.rgba(0,0,0,0.03)
}
return Qt.rgba(0,0,0,0)
if(item_mouse.containsMouse){
return FluTheme.itemHoverColor
}
return FluTheme.itemNormalColor
}
}
Image{
@ -228,7 +220,7 @@ FluScrollablePage{
height: 12
width: 12
radius: 6
color: FluTheme.primaryColor.dark
color: FluTheme.primaryColor
anchors{
right: parent.right
top: parent.top

View File

@ -36,7 +36,7 @@ FluScrollablePage{
color: FluTheme.dark ? FluColors.Black : FluColors.White
FluShadow{
radius: 4
color: FluTheme.primaryColor.dark
color: FluTheme.primaryColor
}
Image{
id:image

View File

@ -67,7 +67,7 @@ FluScrollablePage{
}
Rectangle {
anchors.fill: parent
color:FluTheme.primaryColor.dark
color:FluTheme.primaryColor
}
}
}
@ -79,7 +79,7 @@ FluScrollablePage{
statusMode: FluStatusViewType.Loading
Rectangle{
anchors.fill: parent
color:FluTheme.primaryColor.dark
color:FluTheme.primaryColor
}
}'
}

View File

@ -182,7 +182,7 @@ FluContentPage{
iconSource: FluentIcons.ChevronUp
iconColor: {
if(1 === root.sortType){
return FluTheme.primaryColor.dark
return FluTheme.primaryColor
}
return FluTheme.dark ? Qt.rgba(1,1,1,1) : Qt.rgba(0,0,0,1)
}
@ -203,7 +203,7 @@ FluContentPage{
iconSource: FluentIcons.ChevronDown
iconColor: {
if(2 === root.sortType){
return FluTheme.primaryColor.dark
return FluTheme.primaryColor
}
return FluTheme.dark ? Qt.rgba(1,1,1,1) : Qt.rgba(0,0,0,1)
}

View File

@ -33,7 +33,7 @@ FluScrollablePage{
anchors.centerIn: parent
iconSource: FluentIcons.AcceptMedium
iconSize: 15
visible: modelData === FluTheme.primaryColor
visible: modelData === FluTheme.themeColor
color: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
}
MouseArea{
@ -41,7 +41,7 @@ FluScrollablePage{
anchors.fill: parent
hoverEnabled: true
onClicked: {
FluTheme.primaryColor = modelData
FluTheme.themeColor = modelData
}
}
}
@ -89,7 +89,7 @@ FluScrollablePage{
CodeExpander{
Layout.fillWidth: true
Layout.topMargin: -1
code:'FluTheme.primaryColor = FluColors.Orange
code:'FluTheme.themeColor = FluColors.Orange
FluTheme.dark = true