diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml index cf4717d0..cbe46ce1 100644 --- a/example/qml/window/MainWindow.qml +++ b/example/qml/window/MainWindow.qml @@ -4,6 +4,7 @@ import QtQuick.Controls import QtQuick.Layouts import Qt.labs.platform import FluentUI +import example import "qrc:///example/qml/component" import "qrc:///example/qml/global" @@ -207,6 +208,11 @@ CustomWindow { } } + //todo + CircularReveal{ + anchors.fill: parent + } + Image{ id:img_cache visible: false diff --git a/example/src/component/CircularReveal.cpp b/example/src/component/CircularReveal.cpp new file mode 100644 index 00000000..7fd02327 --- /dev/null +++ b/example/src/component/CircularReveal.cpp @@ -0,0 +1,6 @@ +#include "CircularReveal.h" + +CircularReveal::CircularReveal() +{ + +} diff --git a/example/src/component/CircularReveal.h b/example/src/component/CircularReveal.h new file mode 100644 index 00000000..adc3b41d --- /dev/null +++ b/example/src/component/CircularReveal.h @@ -0,0 +1,16 @@ +#ifndef CIRCULARREVEAL_H +#define CIRCULARREVEAL_H + +#include + +class CircularReveal : public QQuickItem +{ + Q_OBJECT +public: + CircularReveal(); + +signals: + +}; + +#endif // CIRCULARREVEAL_H diff --git a/example/src/main.cpp b/example/src/main.cpp index 009a6090..9beb6f66 100644 --- a/example/src/main.cpp +++ b/example/src/main.cpp @@ -6,6 +6,7 @@ #include #include #include +#include "src/component/CircularReveal.h" #include "AppInfo.h" FRAMELESSHELPER_USE_NAMESPACE @@ -37,6 +38,8 @@ int main(int argc, char *argv[]) app.setQuitOnLastWindowClosed(false); QQmlApplicationEngine engine; FramelessHelper::Quick::registerTypes(&engine); + qmlRegisterType("example", 1, 0, "CircularReveal"); + appInfo->init(&engine); const QUrl url(QStringLiteral("qrc:/example/qml/App.qml")); QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, diff --git a/src/imports/FluentUI/Controls/FluTableView.qml b/src/imports/FluentUI/Controls/FluTableView.qml index 1b81d33c..df7db690 100644 --- a/src/imports/FluentUI/Controls/FluTableView.qml +++ b/src/imports/FluentUI/Controls/FluTableView.qml @@ -191,7 +191,7 @@ Rectangle { implicitWidth: columnSource[column].width Rectangle{ anchors.fill: parent - visible: item_loader.sourceComponent === null + visible: item_loader.sourceComponent == null color: selected ? control.selectionColor : "#00000000" } MouseArea{ @@ -304,6 +304,7 @@ Rectangle { } TapHandler{ onDoubleTapped: { + closeEditor() selection_model.clear() for(var i=0;i<=table_view.rows;i++){ selection_model.select(table_model.index(i,column),ItemSelectionModel.Select) @@ -377,6 +378,7 @@ Rectangle { } TapHandler{ onDoubleTapped: { + closeEditor() selection_model.clear() for(var i=0;i<=columnSource.length;i++){ selection_model.select(table_model.index(row,i),ItemSelectionModel.Select)