This commit is contained in:
朱子楚\zhuzi
2024-03-29 16:56:09 +08:00
parent cb33af8836
commit 6a5f9d04a9
61 changed files with 105 additions and 103 deletions

View File

@ -36,7 +36,7 @@ void FluentUI::registerTypes(const char *uri){
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAcrylic.qml"),uri,major,minor,"FluAcrylic");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAppBar.qml"),uri,major,minor,"FluAppBar");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluArea.qml"),uri,major,minor,"FluArea");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluFrame.qml"),uri,major,minor,"FluFrame");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAutoSuggestBox.qml"),uri,major,minor,"FluAutoSuggestBox");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluBadge.qml"),uri,major,minor,"FluBadge");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluBreadcrumbBar.qml"),uri,major,minor,"FluBreadcrumbBar");

View File

@ -76,7 +76,7 @@ FluButton {
}
contentItem: Item{
clip: true
FluArea{
FluFrame{
id:container
width: 300
height: 360

View File

@ -1,4 +1,5 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls.impl 2.15
import QtQuick.Templates 2.15 as T

View File

@ -42,7 +42,7 @@ Item{
}
Component{
id:com_loading
FluArea{
FluFrame{
padding: 0
border.width: 0
radius: 0
@ -62,7 +62,7 @@ Item{
}
Component {
id:com_empty
FluArea{
FluFrame{
padding: 0
border.width: 0
radius: 0
@ -79,7 +79,7 @@ Item{
}
Component{
id:com_error
FluArea{
FluFrame{
padding: 0
border.width: 0
radius: 0

View File

@ -124,7 +124,7 @@ Popup{
ctx.fill()
}
}
FluArea{
FluFrame{
id: layout_panne
radius: 5
width: 500

View File

@ -5,7 +5,6 @@
<file>FluentUI/Font/Segoe_Fluent_Icons.ttf</file>
<file>FluentUI/Controls/FluAcrylic.qml</file>
<file>FluentUI/Controls/FluAppBar.qml</file>
<file>FluentUI/Controls/FluArea.qml</file>
<file>FluentUI/Controls/FluAutoSuggestBox.qml</file>
<file>FluentUI/Controls/FluBadge.qml</file>
<file>FluentUI/Controls/FluBreadcrumbBar.qml</file>
@ -107,5 +106,6 @@
<file>FluentUI/Controls/qmldir</file>
<file>FluentUI/Controls/FluEvent.qml</file>
<file>FluentUI/Controls/FluEventBus.qml</file>
<file>FluentUI/Controls/FluFrame.qml</file>
</qresource>
</RCC>

View File

@ -75,7 +75,7 @@ FluButton {
}
contentItem: Item{
clip: true
FluArea{
FluFrame{
id:container
width: 300
height: 360

View File

@ -41,7 +41,7 @@ Item{
}
Component{
id:com_loading
FluArea{
FluFrame{
padding: 0
border.width: 0
radius: 0
@ -61,7 +61,7 @@ Item{
}
Component {
id:com_empty
FluArea{
FluFrame{
padding: 0
border.width: 0
radius: 0
@ -78,7 +78,7 @@ Item{
}
Component{
id:com_error
FluArea{
FluFrame{
padding: 0
border.width: 0
radius: 0

View File

@ -124,7 +124,7 @@ Popup{
ctx.fill()
}
}
FluArea{
FluFrame{
id: layout_panne
radius: 5
width: 500