github_mirror
/
FluentUI
mirror of https://github.com/zhuzichu520/FluentUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: github_mirror:eef46a2dacc45394c76c6829485a1e6b3f2e289e
Branches Tags
github_mirror:main
github_mirror:1.7.7
github_mirror:1.7.6
github_mirror:1.7.5
github_mirror:1.7.4
github_mirror:1.7.3
github_mirror:1.7.2
github_mirror:1.7.1
github_mirror:1.7.0
github_mirror:1.6.9
github_mirror:1.6.8
github_mirror:1.6.7
github_mirror:1.6.6
github_mirror:1.6.5
github_mirror:1.6.4
github_mirror:1.6.3
github_mirror:1.6.2
github_mirror:1.6.1
github_mirror:1.6.0
github_mirror:1.5.9
github_mirror:1.5.8
github_mirror:1.5.7
github_mirror:1.5.6
github_mirror:1.5.5
github_mirror:1.5.4
github_mirror:1.5.3
github_mirror:1.5.2
github_mirror:1.5.1
github_mirror:1.5.0
github_mirror:1.4.0
github_mirror:1.3.7.4
github_mirror:1.3.7.3
github_mirror:1.3.7.2
github_mirror:1.3.7.1
github_mirror:1.3.7.0
github_mirror:1.3.6.2
github_mirror:1.3.6.1
github_mirror:1.3.6
github_mirror:1.3.5.1
github_mirror:1.3.5
github_mirror:1.3.4
github_mirror:1.3.3
github_mirror:1.3.2.1
github_mirror:1.3.2
github_mirror:1.3.1
github_mirror:1.3.0
github_mirror:1.2.9
github_mirror:1.2.8
github_mirror:1.2.7
github_mirror:1.2.6
github_mirror:1.2.5
github_mirror:1.2.4
github_mirror:1.2.3
github_mirror:1.2.2
github_mirror:1.2.1
github_mirror:1.2.0
github_mirror:1.1.9
github_mirror:1.1.8
github_mirror:1.1.7
github_mirror:1.1.6
github_mirror:1.1.5
github_mirror:1.1.4
github_mirror:1.1.3
github_mirror:1.1.2
github_mirror:1.1.1
github_mirror:1.1.0
github_mirror:1.0.9
github_mirror:1.0.8
github_mirror:1.0.7
github_mirror:1.0.6
github_mirror:1.0.5
github_mirror:1.0.4
github_mirror:1.0.3
github_mirror:1.0.2
github_mirror:1.0.1
github_mirror:1.0.0
..
compare: github_mirror:35bfb8021f9ba259a46fc66764504046791f2c95
Branches Tags
github_mirror:main
github_mirror:1.7.7
github_mirror:1.7.6
github_mirror:1.7.5
github_mirror:1.7.4
github_mirror:1.7.3
github_mirror:1.7.2
github_mirror:1.7.1
github_mirror:1.7.0
github_mirror:1.6.9
github_mirror:1.6.8
github_mirror:1.6.7
github_mirror:1.6.6
github_mirror:1.6.5
github_mirror:1.6.4
github_mirror:1.6.3
github_mirror:1.6.2
github_mirror:1.6.1
github_mirror:1.6.0
github_mirror:1.5.9
github_mirror:1.5.8
github_mirror:1.5.7
github_mirror:1.5.6
github_mirror:1.5.5
github_mirror:1.5.4
github_mirror:1.5.3
github_mirror:1.5.2
github_mirror:1.5.1
github_mirror:1.5.0
github_mirror:1.4.0
github_mirror:1.3.7.4
github_mirror:1.3.7.3
github_mirror:1.3.7.2
github_mirror:1.3.7.1
github_mirror:1.3.7.0
github_mirror:1.3.6.2
github_mirror:1.3.6.1
github_mirror:1.3.6
github_mirror:1.3.5.1
github_mirror:1.3.5
github_mirror:1.3.4
github_mirror:1.3.3
github_mirror:1.3.2.1
github_mirror:1.3.2
github_mirror:1.3.1
github_mirror:1.3.0
github_mirror:1.2.9
github_mirror:1.2.8
github_mirror:1.2.7
github_mirror:1.2.6
github_mirror:1.2.5
github_mirror:1.2.4
github_mirror:1.2.3
github_mirror:1.2.2
github_mirror:1.2.1
github_mirror:1.2.0
github_mirror:1.1.9
github_mirror:1.1.8
github_mirror:1.1.7
github_mirror:1.1.6
github_mirror:1.1.5
github_mirror:1.1.4
github_mirror:1.1.3
github_mirror:1.1.2
github_mirror:1.1.1
github_mirror:1.1.0
github_mirror:1.0.9
github_mirror:1.0.8
github_mirror:1.0.7
github_mirror:1.0.6
github_mirror:1.0.5
github_mirror:1.0.4
github_mirror:1.0.3
github_mirror:1.0.2
github_mirror:1.0.1
github_mirror:1.0.0

No commits in common. "eef46a2dacc45394c76c6829485a1e6b3f2e289e" and "35bfb8021f9ba259a46fc66764504046791f2c95" have entirely different histories.
eef46a2dac ... 35bfb8021f

14 changed files with 14 additions and 38 deletions
Show Stats Expand all files Collapse all files

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

@ -45,7 +45,7 @@ T.ComboBox {
topPadding: 6 - control.padding topPadding: 6 - control.padding
bottomPadding: 6 - control.padding bottomPadding: 6 - control.padding
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
selectedTextColor: color selectedTextColor: color
text: control.editable ? control.editText : control.displayText text: control.editable ? control.editText : control.displayText
enabled: control.editable enabled: control.editable

4
src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml
View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
TextInput { TextEdit {
property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220 property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
id:control id:control
color: textColor color: textColor
@ -17,7 +17,7 @@ TextInput {
selectByMouse: true selectByMouse: true
selectedTextColor: color selectedTextColor: color
bottomPadding: 0 bottomPadding: 0
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
font:FluTextStyle.Body font:FluTextStyle.Body
onSelectedTextChanged: { onSelectedTextChanged: {
control.forceActiveFocus() control.forceActiveFocus()

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

@ -24,7 +24,7 @@ TextArea{
leftPadding: padding+4 leftPadding: padding+4
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectedTextColor: color selectedTextColor: color
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){
return placeholderDisableColor return placeholderDisableColor

12
src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml
View File

@ -342,7 +342,6 @@ Item {
} }
return com_icon return com_icon
} }
Component.onDestruction: sourceComponent = undefined
} }
} }
FluText{ FluText{
@ -390,7 +389,6 @@ Item {
right: item_title.right right: item_title.right
rightMargin: 8 rightMargin: 8
} }
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(d.isCompact){ if(d.isCompact){
return undefined return undefined
@ -556,7 +554,6 @@ Item {
} }
Loader{ Loader{
anchors.centerIn: parent anchors.centerIn: parent
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(model&&model.iconDelegate){ if(model&&model.iconDelegate){
return model.iconDelegate return model.iconDelegate
@ -619,7 +616,6 @@ Item {
} }
return model.showEdit ? model.editDelegate : undefined return model.showEdit ? model.editDelegate : undefined
} }
Component.onDestruction: sourceComponent = undefined
onStatusChanged: { onStatusChanged: {
if(status === Loader.Ready){ if(status === Loader.Ready){
item.forceActiveFocus() item.forceActiveFocus()
@ -655,7 +651,6 @@ Item {
} }
return undefined return undefined
} }
Component.onDestruction: sourceComponent = undefined
Connections{ Connections{
target: d target: d
function onIsCompactAndNotPanelChanged(){ function onIsCompactAndNotPanelChanged(){
@ -789,7 +784,6 @@ Item {
id:loader_action id:loader_action
anchors.centerIn: parent anchors.centerIn: parent
sourceComponent: actionItem sourceComponent: actionItem
Component.onDestruction: sourceComponent = undefined
} }
} }
} }
@ -845,7 +839,6 @@ Item {
return control.cellWidth return control.cellWidth
} }
} }
Component.onDestruction: sourceComponent = undefined
Behavior on anchors.leftMargin { Behavior on anchors.leftMargin {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.enableAnimation && d.animDisabled
NumberAnimation{ NumberAnimation{
@ -925,7 +918,6 @@ Item {
rightMargin: 6 rightMargin: 6
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
Component.onDestruction: sourceComponent = undefined
visible: { visible: {
if(d.isCompactAndNotPanel){ if(d.isCompactAndNotPanel){
return false return false
@ -997,7 +989,6 @@ Item {
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
property int type: 0 property int type: 0
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(model === null || !model) if(model === null || !model)
return undefined return undefined
@ -1055,7 +1046,6 @@ Item {
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
property int type: 1 property int type: 1
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(modelData instanceof FluPaneItem){ if(modelData instanceof FluPaneItem){
return com_panel_item return com_panel_item
@ -1124,7 +1114,6 @@ Item {
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
rightMargin: 10 rightMargin: 10
} }
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(model.infoBadge){ if(model.infoBadge){
return model.infoBadge return model.infoBadge
@ -1177,7 +1166,6 @@ Item {
} }
Loader{ Loader{
property var modelData property var modelData
Component.onDestruction: sourceComponent = undefined
id:loader_item_menu id:loader_item_menu
} }
Connections{ Connections{

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

@ -25,7 +25,7 @@ TextField{
leftPadding: padding+4 leftPadding: padding+4
echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
selectedTextColor: color selectedTextColor: color
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){

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

@ -39,7 +39,7 @@ T.SpinBox {
} }
return normalColor return normalColor
} }
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
selectedTextColor: color selectedTextColor: color
horizontalAlignment: Qt.AlignHCenter horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter verticalAlignment: Qt.AlignVCenter

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

@ -25,7 +25,7 @@ TextField{
} }
font:FluTextStyle.Body font:FluTextStyle.Body
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
selectedTextColor: color selectedTextColor: color
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){

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

@ -45,7 +45,7 @@ T.ComboBox {
topPadding: 6 - control.padding topPadding: 6 - control.padding
bottomPadding: 6 - control.padding bottomPadding: 6 - control.padding
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
selectedTextColor: color selectedTextColor: color
text: control.editable ? control.editText : control.displayText text: control.editable ? control.editText : control.displayText
enabled: control.editable enabled: control.editable

4
src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls import QtQuick.Controls
import FluentUI import FluentUI
TextInput { TextEdit {
property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220 property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
id:control id:control
color: textColor color: textColor
@ -17,7 +17,7 @@ TextInput {
selectByMouse: true selectByMouse: true
selectedTextColor: color selectedTextColor: color
bottomPadding: 0 bottomPadding: 0
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
font:FluTextStyle.Body font:FluTextStyle.Body
onSelectedTextChanged: { onSelectedTextChanged: {
control.forceActiveFocus() control.forceActiveFocus()

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

@ -25,7 +25,7 @@ TextArea{
leftPadding: padding+4 leftPadding: padding+4
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectedTextColor: color selectedTextColor: color
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){
return placeholderDisableColor return placeholderDisableColor

12
src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml
View File

@ -343,7 +343,6 @@ Item {
} }
return com_icon return com_icon
} }
Component.onDestruction: sourceComponent = undefined
} }
} }
FluText{ FluText{
@ -391,7 +390,6 @@ Item {
right: item_title.right right: item_title.right
rightMargin: 8 rightMargin: 8
} }
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(d.isCompact){ if(d.isCompact){
return undefined return undefined
@ -557,7 +555,6 @@ Item {
} }
Loader{ Loader{
anchors.centerIn: parent anchors.centerIn: parent
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(model&&model.iconDelegate){ if(model&&model.iconDelegate){
return model.iconDelegate return model.iconDelegate
@ -620,7 +617,6 @@ Item {
} }
return model.showEdit ? model.editDelegate : undefined return model.showEdit ? model.editDelegate : undefined
} }
Component.onDestruction: sourceComponent = undefined
onStatusChanged: { onStatusChanged: {
if(status === Loader.Ready){ if(status === Loader.Ready){
item.forceActiveFocus() item.forceActiveFocus()
@ -656,7 +652,6 @@ Item {
} }
return undefined return undefined
} }
Component.onDestruction: sourceComponent = undefined
Connections{ Connections{
target: d target: d
function onIsCompactAndNotPanelChanged(){ function onIsCompactAndNotPanelChanged(){
@ -790,7 +785,6 @@ Item {
id:loader_action id:loader_action
anchors.centerIn: parent anchors.centerIn: parent
sourceComponent: actionItem sourceComponent: actionItem
Component.onDestruction: sourceComponent = undefined
} }
} }
} }
@ -846,7 +840,6 @@ Item {
return control.cellWidth return control.cellWidth
} }
} }
Component.onDestruction: sourceComponent = undefined
Behavior on anchors.leftMargin { Behavior on anchors.leftMargin {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.enableAnimation && d.animDisabled
NumberAnimation{ NumberAnimation{
@ -926,7 +919,6 @@ Item {
rightMargin: 6 rightMargin: 6
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
Component.onDestruction: sourceComponent = undefined
visible: { visible: {
if(d.isCompactAndNotPanel){ if(d.isCompactAndNotPanel){
return false return false
@ -998,7 +990,6 @@ Item {
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
property int type: 0 property int type: 0
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(model === null || !model) if(model === null || !model)
return undefined return undefined
@ -1056,7 +1047,6 @@ Item {
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
property int type: 1 property int type: 1
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(modelData instanceof FluPaneItem){ if(modelData instanceof FluPaneItem){
return com_panel_item return com_panel_item
@ -1125,7 +1115,6 @@ Item {
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
rightMargin: 10 rightMargin: 10
} }
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(model.infoBadge){ if(model.infoBadge){
return model.infoBadge return model.infoBadge
@ -1178,7 +1167,6 @@ Item {
} }
Loader{ Loader{
property var modelData property var modelData
Component.onDestruction: sourceComponent = undefined
id:loader_item_menu id:loader_item_menu
} }
Connections{ Connections{

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

@ -26,7 +26,7 @@ TextField{
leftPadding: padding+4 leftPadding: padding+4
echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
selectedTextColor: color selectedTextColor: color
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){

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

@ -40,7 +40,7 @@ T.SpinBox {
} }
return normalColor return normalColor
} }
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
selectedTextColor: color selectedTextColor: color
horizontalAlignment: Qt.AlignHCenter horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter verticalAlignment: Qt.AlignVCenter

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

@ -26,7 +26,7 @@ TextField{
} }
font:FluTextStyle.Body font:FluTextStyle.Body
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
selectedTextColor: color selectedTextColor: color
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){