amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-26 13:27:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-07-01 07:54:43 +08:00
parent 74940665ae
commit 9ff81251c8
9 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/CMakeLists.txt
View File

@ -19,7 +19,7 @@ endif()
file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
#设置版本号
add_definitions(-DVERSION=1,3,7,1)
add_definitions(-DVERSION=1,3,7,2)
find_package(Qt6 REQUIRED COMPONENTS Quick)

4
example/qml/page/T_TableView.qml
View File

@ -64,8 +64,8 @@ FluContentPage{
address: getRandomAddresses(),
nickname: getRandomNickname(),
longstring:"你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好",
height:44,
minimumHeight:44,
height:46,
minimumHeight:46,
maximumHeight:300,
action:com_action
})

2
example/qml/page/T_TextBox.qml
View File

@ -174,7 +174,7 @@ FluScrollablePage{
FluSpinBox{
Layout.topMargin: 20
// disabled: spin_box_switch.checked
disabled: spin_box_switch.checked
anchors{
verticalCenter: parent.verticalCenter
left: parent.left

2
example/qml/window/MainWindow.qml
View File

@ -180,7 +180,7 @@ CustomWindow {
}
}
transformOrigin: Item.Center
onLoginClicked:{
onLogoClicked:{
clickCount += 1
if(clickCount === 1){
loader.reload()

2
src/CMakeLists.txt
View File

@ -12,7 +12,7 @@ endif()
set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
#设置版本号
add_definitions(-DVERSION=1,3,7,1)
add_definitions(-DVERSION=1,3,7,2)
find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml)

4
src/imports/FluentUI/Controls/FluNavigationView.qml
View File

@ -27,7 +27,7 @@ Item {
property Component autoSuggestBox
property Component actionItem
property int topPadding: 0
signal loginClicked
signal logoClicked
id:control
QtObject{
id:d
@ -584,7 +584,7 @@ Item {
MouseArea{
anchors.fill: parent
onClicked: {
loginClicked()
logoClicked()
}
}
}

1
src/imports/FluentUI/Controls/FluPage.qml
View File

@ -18,5 +18,4 @@ Item {
Component.onCompleted: {
visible = true
}
}

17
src/imports/FluentUI/Controls/FluSpinBox.qml
View File

@ -5,6 +5,7 @@ import FluentUI
Rectangle{
readonly property string displayText : d._displayText
property bool disabled: false
property int from: 0
property int to: 99
property var validator: IntValidator {
@ -27,6 +28,7 @@ Rectangle{
FluTextBox{
rightPadding: 80
closeRightMargin: 55
disabled: control.disabled
validator: control.validator
text: d._displayText
Component.onCompleted: {
@ -51,6 +53,7 @@ Rectangle{
anchors.fill: parent
readOnly: true
rightPadding: 80
disabled: control.disabled
text: control.displayText
MouseArea{
anchors.fill: parent
@ -68,8 +71,13 @@ Rectangle{
width: 20
height: 20
iconSize: 16
disabled: {
if(control.disabled===true){
return true
}
return Number(control.displayText) === control.to
}
iconSource: FluentIcons.ChevronUp
enabled: Number(control.displayText) !== control.to
anchors{
verticalCenter: parent.verticalCenter
right: parent.right
@ -102,8 +110,13 @@ Rectangle{
iconSource: FluentIcons.ChevronDown
width: 20
height: 20
disabled: {
if(control.disabled === true){
return true
}
return Number(control.displayText) === control.from
}
iconSize: 16
enabled: Number(control.displayText) !== control.from
anchors{
verticalCenter: parent.verticalCenter
right: parent.right

2
src/imports/FluentUI/Controls/FluTableView.qml
View File

@ -452,7 +452,7 @@ Rectangle {
var minimumHeight = obj.minimumHeight
var maximumHeight = obj.maximumHeight
if(!minimumHeight){
minimumHeight = 44
minimumHeight = 46
}
if(!maximumHeight){
maximumHeight = 65535