From a2e15fc3b025bad76672b04861e28c4bc7073dce Mon Sep 17 00:00:00 2001 From: zhuzichu Date: Wed, 11 Oct 2023 11:18:48 +0800 Subject: [PATCH] update --- example/qml-Qt6/global/ItemsFooter.qml | 1 - example/qml-Qt6/global/ItemsOriginal.qml | 1 - example/qml/global/ItemsFooter.qml | 1 - example/qml/global/ItemsOriginal.qml | 1 - src/FluApp.cpp | 1 - src/Qt5/imports/FluentUI/Controls/FluTableView.qml | 8 +++----- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/example/qml-Qt6/global/ItemsFooter.qml b/example/qml-Qt6/global/ItemsFooter.qml index 4a2fdf01..e17794ee 100644 --- a/example/qml-Qt6/global/ItemsFooter.qml +++ b/example/qml-Qt6/global/ItemsFooter.qml @@ -2,7 +2,6 @@ pragma Singleton import QtQuick import FluentUI -import "qrc:///example/qml/global" FluObject{ diff --git a/example/qml-Qt6/global/ItemsOriginal.qml b/example/qml-Qt6/global/ItemsOriginal.qml index b9e3d3bc..55d4520e 100644 --- a/example/qml-Qt6/global/ItemsOriginal.qml +++ b/example/qml-Qt6/global/ItemsOriginal.qml @@ -2,7 +2,6 @@ pragma Singleton import QtQuick import FluentUI -import "qrc:///example/qml/global" FluObject{ diff --git a/example/qml/global/ItemsFooter.qml b/example/qml/global/ItemsFooter.qml index 0e6b3cf8..e93ddcb8 100644 --- a/example/qml/global/ItemsFooter.qml +++ b/example/qml/global/ItemsFooter.qml @@ -2,7 +2,6 @@ pragma Singleton import QtQuick 2.15 import FluentUI 1.0 -import "qrc:///example/qml/global" FluObject{ diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml index 36ae30e2..5f06ab0c 100644 --- a/example/qml/global/ItemsOriginal.qml +++ b/example/qml/global/ItemsOriginal.qml @@ -2,7 +2,6 @@ pragma Singleton import QtQuick 2.15 import FluentUI 1.0 -import "qrc:///example/qml/global" FluObject{ diff --git a/src/FluApp.cpp b/src/FluApp.cpp index a21c375c..16b4d140 100644 --- a/src/FluApp.cpp +++ b/src/FluApp.cpp @@ -22,7 +22,6 @@ FluApp::~FluApp(){ void FluApp::init(QQuickWindow *window){ this->_application = window; - qputenv("QT_QUICK_CONTROLS_STYLE","Basic"); FramelessHelper::Quick::initialize(); FramelessConfig::instance()->set(Global::Option::DisableLazyInitializationForMicaMaterial); FramelessConfig::instance()->set(Global::Option::CenterWindowBeforeShow); diff --git a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml index e62228fb..66d77372 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml @@ -322,7 +322,6 @@ Rectangle { id: column_text text: modelData anchors.fill: parent - font.bold: true horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } @@ -464,6 +463,9 @@ Rectangle { return [] } } + onContentYChanged: { + forceLayout() + } delegate: Rectangle{ id:item_control readonly property real cellPadding: 8 @@ -482,10 +484,6 @@ Rectangle { id:row_text anchors.centerIn: parent text: row + 1 - font.bold:{ - d.selectionFlag - return true - } } MouseArea{ id:item_control_mouse