Compare commits
No commits in common. "eef46a2dacc45394c76c6829485a1e6b3f2e289e" and "35bfb8021f9ba259a46fc66764504046791f2c95" have entirely different histories.
eef46a2dac
...
35bfb8021f
|
|
@ -45,7 +45,7 @@ T.ComboBox {
|
|||
topPadding: 6 - control.padding
|
||||
bottomPadding: 6 - control.padding
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
selectedTextColor: color
|
||||
text: control.editable ? control.editText : control.displayText
|
||||
enabled: control.editable
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Controls 2.15
|
||||
import FluentUI 1.0
|
||||
|
||||
TextInput {
|
||||
TextEdit {
|
||||
property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
|
||||
id:control
|
||||
color: textColor
|
||||
|
|
@ -17,7 +17,7 @@ TextInput {
|
|||
selectByMouse: true
|
||||
selectedTextColor: color
|
||||
bottomPadding: 0
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
font:FluTextStyle.Body
|
||||
onSelectedTextChanged: {
|
||||
control.forceActiveFocus()
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ TextArea{
|
|||
leftPadding: padding+4
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
selectedTextColor: color
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
placeholderTextColor: {
|
||||
if(!enabled){
|
||||
return placeholderDisableColor
|
||||
|
|
|
|||
|
|
@ -342,7 +342,6 @@ Item {
|
|||
}
|
||||
return com_icon
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
FluText{
|
||||
|
|
@ -390,7 +389,6 @@ Item {
|
|||
right: item_title.right
|
||||
rightMargin: 8
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(d.isCompact){
|
||||
return undefined
|
||||
|
|
@ -556,7 +554,6 @@ Item {
|
|||
}
|
||||
Loader{
|
||||
anchors.centerIn: parent
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(model&&model.iconDelegate){
|
||||
return model.iconDelegate
|
||||
|
|
@ -619,7 +616,6 @@ Item {
|
|||
}
|
||||
return model.showEdit ? model.editDelegate : undefined
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
onStatusChanged: {
|
||||
if(status === Loader.Ready){
|
||||
item.forceActiveFocus()
|
||||
|
|
@ -655,7 +651,6 @@ Item {
|
|||
}
|
||||
return undefined
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
Connections{
|
||||
target: d
|
||||
function onIsCompactAndNotPanelChanged(){
|
||||
|
|
@ -789,7 +784,6 @@ Item {
|
|||
id:loader_action
|
||||
anchors.centerIn: parent
|
||||
sourceComponent: actionItem
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -845,7 +839,6 @@ Item {
|
|||
return control.cellWidth
|
||||
}
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
Behavior on anchors.leftMargin {
|
||||
enabled: FluTheme.enableAnimation && d.animDisabled
|
||||
NumberAnimation{
|
||||
|
|
@ -925,7 +918,6 @@ Item {
|
|||
rightMargin: 6
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
visible: {
|
||||
if(d.isCompactAndNotPanel){
|
||||
return false
|
||||
|
|
@ -997,7 +989,6 @@ Item {
|
|||
property var model: modelData
|
||||
property var _idx: index
|
||||
property int type: 0
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(model === null || !model)
|
||||
return undefined
|
||||
|
|
@ -1055,7 +1046,6 @@ Item {
|
|||
property var model: modelData
|
||||
property var _idx: index
|
||||
property int type: 1
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(modelData instanceof FluPaneItem){
|
||||
return com_panel_item
|
||||
|
|
@ -1124,7 +1114,6 @@ Item {
|
|||
verticalCenter: parent.verticalCenter
|
||||
rightMargin: 10
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(model.infoBadge){
|
||||
return model.infoBadge
|
||||
|
|
@ -1177,7 +1166,6 @@ Item {
|
|||
}
|
||||
Loader{
|
||||
property var modelData
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
id:loader_item_menu
|
||||
}
|
||||
Connections{
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ TextField{
|
|||
leftPadding: padding+4
|
||||
echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
selectedTextColor: color
|
||||
placeholderTextColor: {
|
||||
if(!enabled){
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ T.SpinBox {
|
|||
}
|
||||
return normalColor
|
||||
}
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
selectedTextColor: color
|
||||
horizontalAlignment: Qt.AlignHCenter
|
||||
verticalAlignment: Qt.AlignVCenter
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ TextField{
|
|||
}
|
||||
font:FluTextStyle.Body
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
selectedTextColor: color
|
||||
placeholderTextColor: {
|
||||
if(!enabled){
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ T.ComboBox {
|
|||
topPadding: 6 - control.padding
|
||||
bottomPadding: 6 - control.padding
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
selectedTextColor: color
|
||||
text: control.editable ? control.editText : control.displayText
|
||||
enabled: control.editable
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import QtQuick
|
|||
import QtQuick.Controls
|
||||
import FluentUI
|
||||
|
||||
TextInput {
|
||||
TextEdit {
|
||||
property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
|
||||
id:control
|
||||
color: textColor
|
||||
|
|
@ -17,7 +17,7 @@ TextInput {
|
|||
selectByMouse: true
|
||||
selectedTextColor: color
|
||||
bottomPadding: 0
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
font:FluTextStyle.Body
|
||||
onSelectedTextChanged: {
|
||||
control.forceActiveFocus()
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ TextArea{
|
|||
leftPadding: padding+4
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
selectedTextColor: color
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
placeholderTextColor: {
|
||||
if(!enabled){
|
||||
return placeholderDisableColor
|
||||
|
|
|
|||
|
|
@ -343,7 +343,6 @@ Item {
|
|||
}
|
||||
return com_icon
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
FluText{
|
||||
|
|
@ -391,7 +390,6 @@ Item {
|
|||
right: item_title.right
|
||||
rightMargin: 8
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(d.isCompact){
|
||||
return undefined
|
||||
|
|
@ -557,7 +555,6 @@ Item {
|
|||
}
|
||||
Loader{
|
||||
anchors.centerIn: parent
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(model&&model.iconDelegate){
|
||||
return model.iconDelegate
|
||||
|
|
@ -620,7 +617,6 @@ Item {
|
|||
}
|
||||
return model.showEdit ? model.editDelegate : undefined
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
onStatusChanged: {
|
||||
if(status === Loader.Ready){
|
||||
item.forceActiveFocus()
|
||||
|
|
@ -656,7 +652,6 @@ Item {
|
|||
}
|
||||
return undefined
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
Connections{
|
||||
target: d
|
||||
function onIsCompactAndNotPanelChanged(){
|
||||
|
|
@ -790,7 +785,6 @@ Item {
|
|||
id:loader_action
|
||||
anchors.centerIn: parent
|
||||
sourceComponent: actionItem
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -846,7 +840,6 @@ Item {
|
|||
return control.cellWidth
|
||||
}
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
Behavior on anchors.leftMargin {
|
||||
enabled: FluTheme.enableAnimation && d.animDisabled
|
||||
NumberAnimation{
|
||||
|
|
@ -926,7 +919,6 @@ Item {
|
|||
rightMargin: 6
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
visible: {
|
||||
if(d.isCompactAndNotPanel){
|
||||
return false
|
||||
|
|
@ -998,7 +990,6 @@ Item {
|
|||
property var model: modelData
|
||||
property var _idx: index
|
||||
property int type: 0
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(model === null || !model)
|
||||
return undefined
|
||||
|
|
@ -1056,7 +1047,6 @@ Item {
|
|||
property var model: modelData
|
||||
property var _idx: index
|
||||
property int type: 1
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(modelData instanceof FluPaneItem){
|
||||
return com_panel_item
|
||||
|
|
@ -1125,7 +1115,6 @@ Item {
|
|||
verticalCenter: parent.verticalCenter
|
||||
rightMargin: 10
|
||||
}
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
sourceComponent: {
|
||||
if(model.infoBadge){
|
||||
return model.infoBadge
|
||||
|
|
@ -1178,7 +1167,6 @@ Item {
|
|||
}
|
||||
Loader{
|
||||
property var modelData
|
||||
Component.onDestruction: sourceComponent = undefined
|
||||
id:loader_item_menu
|
||||
}
|
||||
Connections{
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ TextField{
|
|||
leftPadding: padding+4
|
||||
echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
selectedTextColor: color
|
||||
placeholderTextColor: {
|
||||
if(!enabled){
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ T.SpinBox {
|
|||
}
|
||||
return normalColor
|
||||
}
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
selectedTextColor: color
|
||||
horizontalAlignment: Qt.AlignHCenter
|
||||
verticalAlignment: Qt.AlignVCenter
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ TextField{
|
|||
}
|
||||
font:FluTextStyle.Body
|
||||
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
|
||||
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25)
|
||||
selectedTextColor: color
|
||||
placeholderTextColor: {
|
||||
if(!enabled){
|
||||
|
|
|
|||
Loading…
Reference in New Issue