mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2024-11-24 19:50:44 +08:00
Compare commits
No commits in common. "1797276e52a6564a5587a2bf1a9e52eba8df2435" and "3e28c42e1cb715f6aa89f1dac2a235197ed42b1f" have entirely different histories.
1797276e52
...
3e28c42e1c
@ -2262,21 +2262,20 @@ Some contents...</source>
|
||||
<message>
|
||||
<location filename="qml/page/T_Theme.qml" line="123"/>
|
||||
<source>Open Blur Window</source>
|
||||
<oldsource>Rounded Window</oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Theme.qml" line="158"/>
|
||||
<location filename="qml/page/T_Theme.qml" line="136"/>
|
||||
<source>window tintOpacity</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Theme.qml" line="175"/>
|
||||
<location filename="qml/page/T_Theme.qml" line="153"/>
|
||||
<source>window blurRadius</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Theme.qml" line="135"/>
|
||||
<location filename="qml/page/T_Theme.qml" line="169"/>
|
||||
<source>window effect</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
||||
@ -2444,23 +2444,22 @@ Some contents...</source>
|
||||
<message>
|
||||
<location filename="qml/page/T_Theme.qml" line="123"/>
|
||||
<source>Open Blur Window</source>
|
||||
<oldsource>Rounded Window</oldsource>
|
||||
<translation>亚克力背景</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Theme.qml" line="158"/>
|
||||
<location filename="qml/page/T_Theme.qml" line="136"/>
|
||||
<source>window tintOpacity</source>
|
||||
<translation>背景透明度</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Theme.qml" line="175"/>
|
||||
<location filename="qml/page/T_Theme.qml" line="153"/>
|
||||
<source>window blurRadius</source>
|
||||
<translation>背景模糊度</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Theme.qml" line="135"/>
|
||||
<location filename="qml/page/T_Theme.qml" line="169"/>
|
||||
<source>window effect</source>
|
||||
<translation>窗口效果</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Theme.qml" line="178"/>
|
||||
|
||||
@ -131,28 +131,6 @@ FluScrollablePage{
|
||||
FluTheme.blurBehindWindowEnabled = !FluTheme.blurBehindWindowEnabled
|
||||
}
|
||||
}
|
||||
FluText{
|
||||
text: qsTr("window effect")
|
||||
Layout.topMargin: 20
|
||||
}
|
||||
Row{
|
||||
spacing: 10
|
||||
Repeater{
|
||||
model: window.availableEffects
|
||||
delegate: FluRadioButton{
|
||||
checked: window.effect === modelData
|
||||
text: qsTr(`${modelData}`)
|
||||
clickListener:function(){
|
||||
window.effect = modelData
|
||||
if(window.effective){
|
||||
FluTheme.blurBehindWindowEnabled = false
|
||||
toggle_blur.checked = Qt.binding( function() {return FluTheme.blurBehindWindowEnabled})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
FluText{
|
||||
visible: FluTheme.blurBehindWindowEnabled || window.effect === "dwm-blur"
|
||||
text: qsTr("window tintOpacity")
|
||||
@ -187,6 +165,28 @@ FluScrollablePage{
|
||||
value = window.blurRadius
|
||||
}
|
||||
}
|
||||
FluText{
|
||||
text: qsTr("window effect")
|
||||
Layout.topMargin: 20
|
||||
}
|
||||
Row{
|
||||
spacing: 10
|
||||
Repeater{
|
||||
model: window.availableEffects
|
||||
delegate: FluRadioButton{
|
||||
checked: window.effect === modelData
|
||||
text: qsTr(`${modelData}`)
|
||||
clickListener:function(){
|
||||
window.effect = modelData
|
||||
if(window.effective){
|
||||
FluTheme.blurBehindWindowEnabled = false
|
||||
toggle_blur.checked = Qt.binding( function() {return FluTheme.blurBehindWindowEnabled})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
CodeExpander{
|
||||
|
||||
@ -227,7 +227,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
|
||||
if ((${QT_VERSION_MAJOR} LESS_EQUAL 6) AND (CMAKE_BUILD_TYPE MATCHES "Release"))
|
||||
find_program(QML_PLUGIN_DUMP NAMES qmlplugindump)
|
||||
add_custom_target(Script-Generate-QmlTypes
|
||||
COMMAND ${QML_PLUGIN_DUMP} -nonrelocatable -noinstantiate FluentUI 1.0 ${CMAKE_CURRENT_BINARY_DIR} > ${CMAKE_CURRENT_SOURCE_DIR}/Qt5/imports/FluentUI/plugins.qmltypes
|
||||
COMMAND ${QML_PLUGIN_DUMP} -nonrelocatable FluentUI 1.0 ${CMAKE_CURRENT_BINARY_DIR} > ${CMAKE_CURRENT_SOURCE_DIR}/Qt5/imports/FluentUI/plugins.qmltypes
|
||||
COMMENT "Generate qmltypes........."
|
||||
SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Qt5/imports/FluentUI/plugins.qmltypes
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#include "FluFrameless.h"
|
||||
#include "FluTheme.h"
|
||||
|
||||
#include <QQuickWindow>
|
||||
#include <QGuiApplication>
|
||||
@ -75,7 +76,7 @@ static inline bool isWin10Only() {
|
||||
|
||||
static inline bool isWin7Only() {
|
||||
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
|
||||
return rovi.dwMajorVersion == 7;
|
||||
return rovi.dwMajorVersion = 7;
|
||||
}
|
||||
|
||||
static inline QByteArray qtNativeEventType() {
|
||||
@ -144,9 +145,6 @@ static inline void setShadow(HWND hwnd) {
|
||||
if (initializeFunctionPointers()) {
|
||||
pDwmExtendFrameIntoClientArea(hwnd, &shadow);
|
||||
}
|
||||
if(isWin7Only()){
|
||||
SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) | CS_DROPSHADOW);
|
||||
}
|
||||
}
|
||||
|
||||
static inline bool setWindowDarkMode(HWND hwnd, const BOOL enable) {
|
||||
@ -180,6 +178,8 @@ static inline bool setWindowEffect(HWND hwnd, const QString &key, const bool &en
|
||||
pDwmSetWindowAttribute(hwnd, 1029, &enable, sizeof(enable));
|
||||
}
|
||||
}
|
||||
BOOL isDark = FluTheme::getInstance()->dark();
|
||||
setWindowDarkMode(hwnd, isDark);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -195,6 +195,8 @@ static inline bool setWindowEffect(HWND hwnd, const QString &key, const bool &en
|
||||
const DWORD backdropType = _DWMSBT_AUTO;
|
||||
pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
|
||||
}
|
||||
BOOL isDark = FluTheme::getInstance()->dark();
|
||||
setWindowDarkMode(hwnd, isDark);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -210,6 +212,8 @@ static inline bool setWindowEffect(HWND hwnd, const QString &key, const bool &en
|
||||
const DWORD backdropType = _DWMSBT_AUTO;
|
||||
pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
|
||||
}
|
||||
BOOL isDark = FluTheme::getInstance()->dark();
|
||||
setWindowDarkMode(hwnd, isDark);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -217,6 +221,8 @@ static inline bool setWindowEffect(HWND hwnd, const QString &key, const bool &en
|
||||
if ((isWin7Only() && !isCompositionEnabled()) || !initializeFunctionPointers()) {
|
||||
return false;
|
||||
}
|
||||
BOOL isDark = FluTheme::getInstance()->dark();
|
||||
setWindowDarkMode(hwnd, isDark && enable);
|
||||
if (enable) {
|
||||
if (isWin8OrGreater()) {
|
||||
ACCENT_POLICY policy{};
|
||||
@ -278,7 +284,6 @@ FluFrameless::FluFrameless(QQuickItem *parent) : QQuickItem{parent} {
|
||||
_topmost = false;
|
||||
_disabled = false;
|
||||
_effect = "normal";
|
||||
_effective = false;
|
||||
_isWindows11OrGreater = FluTools::getInstance()->isWindows11OrGreater();
|
||||
}
|
||||
|
||||
@ -289,47 +294,6 @@ FluFrameless::~FluFrameless() = default;
|
||||
}
|
||||
|
||||
void FluFrameless::componentComplete() {
|
||||
#ifdef Q_OS_WIN
|
||||
HWND hwnd = reinterpret_cast<HWND>(window()->winId());
|
||||
if (isWin11OrGreater()) {
|
||||
availableEffects({"mica", "mica-alt", "acrylic", "dwm-blur", "normal"});
|
||||
} else {
|
||||
availableEffects({"dwm-blur","normal"});
|
||||
}
|
||||
if (!_effect.isEmpty() && _useSystemEffect) {
|
||||
effective(setWindowEffect(hwnd, _effect, true));
|
||||
if (effective()) {
|
||||
_currentEffect = effect();
|
||||
}
|
||||
}
|
||||
connect(this, &FluFrameless::effectChanged, this, [hwnd, this] {
|
||||
if (effect() == _currentEffect) {
|
||||
return;
|
||||
}
|
||||
if (effective()) {
|
||||
setWindowEffect(hwnd, _currentEffect, false);
|
||||
}
|
||||
effective(setWindowEffect(hwnd, effect(), true));
|
||||
if (effective()) {
|
||||
_currentEffect = effect();
|
||||
_useSystemEffect = true;
|
||||
} else {
|
||||
_effect = "normal";
|
||||
_currentEffect = "normal";
|
||||
_useSystemEffect = false;
|
||||
}
|
||||
});
|
||||
connect(this, &FluFrameless::useSystemEffectChanged, this, [this] {
|
||||
if (!_useSystemEffect) {
|
||||
effect("normal");
|
||||
}
|
||||
});
|
||||
connect(this, &FluFrameless::isDarkModeChanged, this, [hwnd, this] {
|
||||
if (effective() && !_currentEffect.isEmpty() && _currentEffect != "normal") {
|
||||
setWindowDarkMode(hwnd, _isDarkMode);
|
||||
}
|
||||
});
|
||||
#endif
|
||||
if (_disabled) {
|
||||
return;
|
||||
}
|
||||
@ -355,9 +319,7 @@ void FluFrameless::componentComplete() {
|
||||
#if (QT_VERSION == QT_VERSION_CHECK(6, 5, 3))
|
||||
qWarning()<<"Qt's own frameless bug, currently only exist in 6.5.3, please use other versions";
|
||||
#endif
|
||||
if(!hwnd){
|
||||
hwnd = reinterpret_cast<HWND>(window()->winId());
|
||||
}
|
||||
HWND hwnd = reinterpret_cast<HWND>(window()->winId());
|
||||
DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
|
||||
# if (QT_VERSION == QT_VERSION_CHECK(6, 7, 2))
|
||||
style &= ~(WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU);
|
||||
@ -380,6 +342,42 @@ void FluFrameless::componentComplete() {
|
||||
if (!window()->property("_hideShadow").toBool()) {
|
||||
setShadow(hwnd);
|
||||
}
|
||||
if (isWin11OrGreater()) {
|
||||
availableEffects({"mica", "mica-alt", "acrylic", "dwm-blur", "normal"});
|
||||
} else if (isWin7Only()) {
|
||||
availableEffects({"dwm-blur","normal"});
|
||||
}
|
||||
if (!_effect.isEmpty()) {
|
||||
effective(setWindowEffect(hwnd, _effect, true));
|
||||
if (effective()) {
|
||||
_currentEffect = effect();
|
||||
}
|
||||
}
|
||||
connect(this, &FluFrameless::effectChanged, this, [hwnd, this] {
|
||||
if (effect() == _currentEffect) {
|
||||
return;
|
||||
}
|
||||
if (effective()) {
|
||||
setWindowEffect(hwnd, _currentEffect, false);
|
||||
}
|
||||
effective(setWindowEffect(hwnd, effect(), true));
|
||||
if (effective()) {
|
||||
_currentEffect = effect();
|
||||
} else {
|
||||
_effect = "normal";
|
||||
_currentEffect = "normal";
|
||||
}
|
||||
});
|
||||
connect(FluTheme::getInstance(), &FluTheme::blurBehindWindowEnabledChanged, this, [this] {
|
||||
if (FluTheme::getInstance()->blurBehindWindowEnabled()) {
|
||||
effect("normal");
|
||||
}
|
||||
});
|
||||
connect(FluTheme::getInstance(), &FluTheme::darkChanged, this, [hwnd, this] {
|
||||
if (effective() && !_currentEffect.isEmpty() && _currentEffect != "normal") {
|
||||
setWindowDarkMode(hwnd, FluTheme::getInstance()->dark());
|
||||
}
|
||||
});
|
||||
#endif
|
||||
auto appBarHeight = _appbar->height();
|
||||
h = qRound(h + appBarHeight);
|
||||
@ -489,10 +487,10 @@ void FluFrameless::componentComplete() {
|
||||
*result = FALSE;
|
||||
return false;
|
||||
} else if (uMsg == WM_NCACTIVATE) {
|
||||
*result = TRUE;
|
||||
if (effective() || (!effect().isEmpty() && _currentEffect!="normal")) {
|
||||
return false;
|
||||
}
|
||||
*result = TRUE;
|
||||
return true;
|
||||
} else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONDBLCLK || uMsg == WM_NCLBUTTONDOWN)) {
|
||||
if (_hitMaximizeButton()) {
|
||||
@ -617,27 +615,27 @@ void FluFrameless::_setMaximizeHovered(bool val) {
|
||||
|
||||
void FluFrameless::_updateCursor(int edges) {
|
||||
switch (edges) {
|
||||
case 0:
|
||||
window()->setCursor(Qt::ArrowCursor);
|
||||
break;
|
||||
case Qt::LeftEdge:
|
||||
case Qt::RightEdge:
|
||||
window()->setCursor(Qt::SizeHorCursor);
|
||||
break;
|
||||
case Qt::TopEdge:
|
||||
case Qt::BottomEdge:
|
||||
window()->setCursor(Qt::SizeVerCursor);
|
||||
break;
|
||||
case Qt::LeftEdge | Qt::TopEdge:
|
||||
case Qt::RightEdge | Qt::BottomEdge:
|
||||
window()->setCursor(Qt::SizeFDiagCursor);
|
||||
break;
|
||||
case Qt::RightEdge | Qt::TopEdge:
|
||||
case Qt::LeftEdge | Qt::BottomEdge:
|
||||
window()->setCursor(Qt::SizeBDiagCursor);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
case 0:
|
||||
window()->setCursor(Qt::ArrowCursor);
|
||||
break;
|
||||
case Qt::LeftEdge:
|
||||
case Qt::RightEdge:
|
||||
window()->setCursor(Qt::SizeHorCursor);
|
||||
break;
|
||||
case Qt::TopEdge:
|
||||
case Qt::BottomEdge:
|
||||
window()->setCursor(Qt::SizeVerCursor);
|
||||
break;
|
||||
case Qt::LeftEdge | Qt::TopEdge:
|
||||
case Qt::RightEdge | Qt::BottomEdge:
|
||||
window()->setCursor(Qt::SizeFDiagCursor);
|
||||
break;
|
||||
case Qt::RightEdge | Qt::TopEdge:
|
||||
case Qt::LeftEdge | Qt::BottomEdge:
|
||||
window()->setCursor(Qt::SizeBDiagCursor);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -689,72 +687,72 @@ void FluFrameless::_setWindowTopmost(bool topmost) {
|
||||
bool FluFrameless::eventFilter(QObject *obj, QEvent *ev) {
|
||||
#ifndef Q_OS_WIN
|
||||
switch (ev->type()) {
|
||||
case QEvent::MouseButtonPress:
|
||||
if(_edges!=0){
|
||||
QMouseEvent *event = static_cast<QMouseEvent*>(ev);
|
||||
if(event->button() == Qt::LeftButton){
|
||||
_updateCursor(_edges);
|
||||
window()->startSystemResize(Qt::Edges(_edges));
|
||||
}
|
||||
}else{
|
||||
if(_hitAppBar()){
|
||||
qint64 clickTimer = QDateTime::currentMSecsSinceEpoch();
|
||||
qint64 offset = clickTimer - this->_clickTimer;
|
||||
this->_clickTimer = clickTimer;
|
||||
if(offset<300){
|
||||
if(_isMaximized()){
|
||||
showNormal();
|
||||
}else{
|
||||
showMaximized();
|
||||
}
|
||||
}else{
|
||||
window()->startSystemMove();
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case QEvent::MouseButtonRelease:
|
||||
_edges = 0;
|
||||
break;
|
||||
case QEvent::MouseMove: {
|
||||
if(_isMaximized() || _isFullScreen()){
|
||||
break;
|
||||
}
|
||||
if(_fixSize){
|
||||
break;
|
||||
}
|
||||
case QEvent::MouseButtonPress:
|
||||
if(_edges!=0){
|
||||
QMouseEvent *event = static_cast<QMouseEvent*>(ev);
|
||||
QPoint p =
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
|
||||
event->pos();
|
||||
#else
|
||||
event->position().toPoint();
|
||||
#endif
|
||||
if(p.x() >= _margins && p.x() <= (window()->width() - _margins) && p.y() >= _margins && p.y() <= (window()->height() - _margins)){
|
||||
if(_edges != 0){
|
||||
_edges = 0;
|
||||
_updateCursor(_edges);
|
||||
if(event->button() == Qt::LeftButton){
|
||||
_updateCursor(_edges);
|
||||
window()->startSystemResize(Qt::Edges(_edges));
|
||||
}
|
||||
}else{
|
||||
if(_hitAppBar()){
|
||||
qint64 clickTimer = QDateTime::currentMSecsSinceEpoch();
|
||||
qint64 offset = clickTimer - this->_clickTimer;
|
||||
this->_clickTimer = clickTimer;
|
||||
if(offset<300){
|
||||
if(_isMaximized()){
|
||||
showNormal();
|
||||
}else{
|
||||
showMaximized();
|
||||
}
|
||||
}else{
|
||||
window()->startSystemMove();
|
||||
}
|
||||
break;
|
||||
}
|
||||
_edges = 0;
|
||||
if ( p.x() < _margins ) {
|
||||
_edges |= Qt::LeftEdge;
|
||||
}
|
||||
if ( p.x() > (window()->width() - _margins) ) {
|
||||
_edges |= Qt::RightEdge;
|
||||
}
|
||||
if ( p.y() < _margins ) {
|
||||
_edges |= Qt::TopEdge;
|
||||
}
|
||||
if ( p.y() > (window()->height() - _margins) ) {
|
||||
_edges |= Qt::BottomEdge;
|
||||
}
|
||||
_updateCursor(_edges);
|
||||
}
|
||||
break;
|
||||
case QEvent::MouseButtonRelease:
|
||||
_edges = 0;
|
||||
break;
|
||||
case QEvent::MouseMove: {
|
||||
if(_isMaximized() || _isFullScreen()){
|
||||
break;
|
||||
}
|
||||
default:
|
||||
if(_fixSize){
|
||||
break;
|
||||
}
|
||||
QMouseEvent *event = static_cast<QMouseEvent*>(ev);
|
||||
QPoint p =
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
|
||||
event->pos();
|
||||
#else
|
||||
event->position().toPoint();
|
||||
#endif
|
||||
if(p.x() >= _margins && p.x() <= (window()->width() - _margins) && p.y() >= _margins && p.y() <= (window()->height() - _margins)){
|
||||
if(_edges != 0){
|
||||
_edges = 0;
|
||||
_updateCursor(_edges);
|
||||
}
|
||||
break;
|
||||
}
|
||||
_edges = 0;
|
||||
if ( p.x() < _margins ) {
|
||||
_edges |= Qt::LeftEdge;
|
||||
}
|
||||
if ( p.x() > (window()->width() - _margins) ) {
|
||||
_edges |= Qt::RightEdge;
|
||||
}
|
||||
if ( p.y() < _margins ) {
|
||||
_edges |= Qt::TopEdge;
|
||||
}
|
||||
if ( p.y() > (window()->height() - _margins) ) {
|
||||
_edges |= Qt::BottomEdge;
|
||||
}
|
||||
_updateCursor(_edges);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
return QObject::eventFilter(obj, ev);
|
||||
|
||||
@ -117,8 +117,6 @@ class FluFrameless : public QQuickItem, QAbstractNativeEventFilter {
|
||||
Q_PROPERTY_AUTO(QString, effect)
|
||||
Q_PROPERTY_READONLY_AUTO(bool, effective)
|
||||
Q_PROPERTY_READONLY_AUTO(QStringList, availableEffects)
|
||||
Q_PROPERTY_AUTO(bool, isDarkMode)
|
||||
Q_PROPERTY_AUTO(bool, useSystemEffect)
|
||||
QML_NAMED_ELEMENT(FluFrameless)
|
||||
public:
|
||||
explicit FluFrameless(QQuickItem *parent = nullptr);
|
||||
@ -164,7 +162,6 @@ private:
|
||||
|
||||
void _setMaximizeHovered(bool val);
|
||||
|
||||
|
||||
private:
|
||||
quint64 _current = 0;
|
||||
int _edges = 0;
|
||||
|
||||
@ -162,41 +162,31 @@ void FluentUI::registerTypes(const char *uri) const {
|
||||
qmlRegisterUncreatableMetaObject(FluTimelineType::staticMetaObject, uri, major, minor, "FluTimelineType", "Access to enums & flags only");
|
||||
qmlRegisterUncreatableMetaObject(FluSheetType::staticMetaObject, uri, major, minor, "FluSheetType", "Access to enums & flags only");
|
||||
|
||||
qmlRegisterSingletonType<FluApp>(uri, major, minor, "FluApp",
|
||||
[](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
|
||||
Q_UNUSED(scriptEngine)
|
||||
QObject *instance = FluApp::getInstance();
|
||||
engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
|
||||
return instance;
|
||||
});
|
||||
qmlRegisterSingletonType<FluColors>(uri, major, minor, "FluColors",
|
||||
[](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
|
||||
Q_UNUSED(scriptEngine)
|
||||
QObject *instance = FluColors::getInstance();
|
||||
engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
|
||||
return instance;
|
||||
});
|
||||
qmlRegisterSingletonType<FluTheme>(uri, major, minor, "FluTheme",
|
||||
[](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
|
||||
Q_UNUSED(scriptEngine)
|
||||
QObject *instance = FluTheme::getInstance();
|
||||
engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
|
||||
return instance;
|
||||
});
|
||||
qmlRegisterSingletonType<FluTools>(uri, major, minor, "FluTools",
|
||||
[](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
|
||||
Q_UNUSED(scriptEngine)
|
||||
QObject *instance = FluTools::getInstance();
|
||||
engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
|
||||
return instance;
|
||||
});
|
||||
qmlRegisterSingletonType<FluTextStyle>(uri, major, minor, "FluTextStyle",
|
||||
[](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
|
||||
Q_UNUSED(scriptEngine)
|
||||
QObject *instance = FluTextStyle::getInstance();
|
||||
engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
|
||||
return instance;
|
||||
});
|
||||
qmlRegisterSingletonType(uri, major, minor, "FluApp", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
|
||||
Q_UNUSED(engine)
|
||||
return scriptEngine->newQObject(FluApp::getInstance());
|
||||
});
|
||||
qmlRegisterSingletonType(uri, major, minor, "FluColors", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
|
||||
Q_UNUSED(engine)
|
||||
return scriptEngine->newQObject(FluColors::getInstance());
|
||||
});
|
||||
qmlRegisterSingletonType(uri, major, minor, "FluTheme", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
|
||||
Q_UNUSED(engine)
|
||||
return scriptEngine->newQObject(FluTheme::getInstance());
|
||||
});
|
||||
qmlRegisterSingletonType(uri, major, minor, "FluTools", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
|
||||
Q_UNUSED(engine)
|
||||
return scriptEngine->newQObject(FluTools::getInstance());
|
||||
});
|
||||
qmlRegisterSingletonType(uri, major, minor, "FluTextStyle", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QJSValue {
|
||||
Q_UNUSED(engine)
|
||||
return scriptEngine->newQObject(FluTextStyle::getInstance());
|
||||
});
|
||||
// qmlRegisterSingletonInstance(uri, major, minor, "FluApp", FluApp::getInstance());
|
||||
// qmlRegisterSingletonInstance(uri, major, minor, "FluColors", FluColors::getInstance());
|
||||
// qmlRegisterSingletonInstance(uri, major, minor, "FluTheme", FluTheme::getInstance());
|
||||
// qmlRegisterSingletonInstance(uri, major, minor, "FluTools", FluTools::getInstance());
|
||||
// qmlRegisterSingletonInstance(uri, major, minor, "FluTextStyle", FluTextStyle::getInstance());
|
||||
qmlRegisterModule(uri, major, minor);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ Window {
|
||||
property int blurRadius: 60
|
||||
property alias effect: frameless.effect
|
||||
readonly property alias effective: frameless.effective
|
||||
readonly property alias availableEffects: frameless.availableEffects
|
||||
readonly property var availableEffects: frameless.availableEffects
|
||||
property Item appBar: FluAppBar {
|
||||
title: window.title
|
||||
height: 30
|
||||
@ -114,8 +114,6 @@ Window {
|
||||
fixSize: window.fixSize
|
||||
topmost: window.stayTop
|
||||
disabled: FluApp.useSystemAppBar
|
||||
isDarkMode: FluTheme.dark
|
||||
useSystemEffect: !FluTheme.blurBehindWindowEnabled
|
||||
Component.onCompleted: {
|
||||
frameless.setHitTestVisible(appBar.layoutMacosButtons)
|
||||
frameless.setHitTestVisible(appBar.layoutStandardbuttons)
|
||||
|
||||
@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
|
||||
// It is used for QML tooling purposes only.
|
||||
//
|
||||
// This file was auto-generated by:
|
||||
// 'qmlplugindump -nonrelocatable -noinstantiate FluentUI 1.0 F:/FluentUI/build/Desktop_Qt_5_15_2_MSVC2019_32bit-Release/src'
|
||||
// 'qmlplugindump -nonrelocatable FluentUI 1.0 D:/QtProjects/build-FluentUI-Desktop_Qt_5_15_2_MSVC2019_64bit-Release/src'
|
||||
|
||||
Module {
|
||||
dependencies: ["QtQuick 2.0"]
|
||||
@ -151,10 +151,8 @@ Module {
|
||||
Property { name: "disabled"; type: "bool" }
|
||||
Property { name: "fixSize"; type: "bool" }
|
||||
Property { name: "effect"; type: "string" }
|
||||
Property { name: "effective"; type: "bool"; isReadonly: true }
|
||||
Property { name: "availableEffects"; type: "QStringList"; isReadonly: true }
|
||||
Property { name: "isDarkMode"; type: "bool" }
|
||||
Property { name: "useSystemEffect"; type: "bool" }
|
||||
Property { name: "effective"; type: "bool" }
|
||||
Property {name: "availableEffects"; type: "QVariant"}
|
||||
Method { name: "showFullScreen" }
|
||||
Method { name: "showMaximized" }
|
||||
Method { name: "showMinimized" }
|
||||
@ -401,6 +399,7 @@ Module {
|
||||
Property { name: "nativeText"; type: "bool" }
|
||||
Property { name: "animationEnabled"; type: "bool" }
|
||||
Property { name: "blurBehindWindowEnabled"; type: "bool" }
|
||||
Property { name: "micaBackgroundColor"; type: "QColor" }
|
||||
}
|
||||
Component {
|
||||
name: "FluThemeType"
|
||||
@ -674,12 +673,12 @@ Module {
|
||||
}
|
||||
}
|
||||
Component {
|
||||
name: "FluentIcons"
|
||||
name: "Fluent_Icons"
|
||||
exports: ["FluentUI/FluentIcons 1.0"]
|
||||
isCreatable: false
|
||||
exportMetaObjectRevisions: [0]
|
||||
Enum {
|
||||
name: "Type"
|
||||
name: "Fluent_IconType"
|
||||
values: {
|
||||
"GlobalNavButton": 59136,
|
||||
"Wifi": 59137,
|
||||
@ -2454,240 +2453,6 @@ Module {
|
||||
Method { name: "clear" }
|
||||
Method { name: "invalidate" }
|
||||
}
|
||||
Component {
|
||||
name: "QmlQCustomPlot::Axis"
|
||||
prototype: "QObject"
|
||||
exports: ["FluentUI/Axis 1.0"]
|
||||
isCreatable: false
|
||||
exportMetaObjectRevisions: [0]
|
||||
Enum {
|
||||
name: "TickerType"
|
||||
values: {
|
||||
"Fixed": 0,
|
||||
"Log": 1,
|
||||
"Pi": 2,
|
||||
"Text": 3,
|
||||
"DateTime": 4,
|
||||
"Time": 5
|
||||
}
|
||||
}
|
||||
Property { name: "visible"; type: "bool" }
|
||||
Property { name: "label"; type: "string" }
|
||||
Property { name: "upper"; type: "float" }
|
||||
Property { name: "lower"; type: "float" }
|
||||
Property { name: "grid"; type: "QmlQCustomPlot::Grid"; isReadonly: true; isPointer: true }
|
||||
Property { name: "ticker"; type: "QmlQCustomPlot::Ticker"; isReadonly: true; isPointer: true }
|
||||
Signal {
|
||||
name: "visibleChanged"
|
||||
Parameter { type: "bool" }
|
||||
}
|
||||
Signal {
|
||||
name: "labelChanged"
|
||||
Parameter { type: "string" }
|
||||
}
|
||||
Signal {
|
||||
name: "upperChanged"
|
||||
Parameter { type: "float" }
|
||||
}
|
||||
Signal {
|
||||
name: "lowerChanged"
|
||||
Parameter { type: "float" }
|
||||
}
|
||||
Signal {
|
||||
name: "gridChanged"
|
||||
Parameter { type: "QmlQCustomPlot::Grid"; isPointer: true }
|
||||
}
|
||||
Signal {
|
||||
name: "tickerChanged"
|
||||
Parameter { type: "QmlQCustomPlot::Ticker"; isPointer: true }
|
||||
}
|
||||
Method {
|
||||
name: "setTickerType"
|
||||
Parameter { name: "type"; type: "TickerType" }
|
||||
}
|
||||
Method {
|
||||
name: "setRange"
|
||||
Parameter { name: "position"; type: "float" }
|
||||
Parameter { name: "size"; type: "float" }
|
||||
Parameter { name: "align"; type: "Qt::AlignmentFlag" }
|
||||
}
|
||||
Method {
|
||||
name: "setRange"
|
||||
Parameter { name: "lower"; type: "float" }
|
||||
Parameter { name: "upper"; type: "float" }
|
||||
}
|
||||
}
|
||||
Component {
|
||||
name: "QmlQCustomPlot::BasePlot"
|
||||
defaultProperty: "data"
|
||||
prototype: "QQuickPaintedItem"
|
||||
exports: ["FluentUI/BasePlot 1.0"]
|
||||
exportMetaObjectRevisions: [0]
|
||||
Property { name: "backgroundColor"; type: "QColor" }
|
||||
Property { name: "xAxis"; type: "QmlQCustomPlot::Axis"; isReadonly: true; isPointer: true }
|
||||
Property { name: "x1Axis"; type: "QmlQCustomPlot::Axis"; isReadonly: true; isPointer: true }
|
||||
Property { name: "yAxis"; type: "QmlQCustomPlot::Axis"; isReadonly: true; isPointer: true }
|
||||
Property { name: "y1Axis"; type: "QmlQCustomPlot::Axis"; isReadonly: true; isPointer: true }
|
||||
Property { name: "graphs"; type: "QVariantMap"; isReadonly: true }
|
||||
Signal {
|
||||
name: "backgroundColorChanged"
|
||||
Parameter { type: "QColor" }
|
||||
}
|
||||
Signal {
|
||||
name: "xAxisChanged"
|
||||
Parameter { type: "QmlQCustomPlot::Axis"; isPointer: true }
|
||||
}
|
||||
Signal {
|
||||
name: "x1AxisChanged"
|
||||
Parameter { type: "QmlQCustomPlot::Axis"; isPointer: true }
|
||||
}
|
||||
Signal {
|
||||
name: "yAxisChanged"
|
||||
Parameter { type: "QmlQCustomPlot::Axis"; isPointer: true }
|
||||
}
|
||||
Signal {
|
||||
name: "y1AxisChanged"
|
||||
Parameter { type: "QmlQCustomPlot::Axis"; isPointer: true }
|
||||
}
|
||||
Method {
|
||||
name: "addGraph"
|
||||
Parameter { name: "key"; type: "string" }
|
||||
}
|
||||
Method {
|
||||
name: "removeGraph"
|
||||
Parameter { name: "key"; type: "string" }
|
||||
}
|
||||
Method {
|
||||
name: "rescaleAxes"
|
||||
Parameter { name: "onlyVisiblePlottables"; type: "bool" }
|
||||
}
|
||||
Method { name: "rescaleAxes" }
|
||||
}
|
||||
Component {
|
||||
name: "QmlQCustomPlot::Grid"
|
||||
prototype: "QObject"
|
||||
exports: ["FluentUI/PlotGrid 1.0"]
|
||||
isCreatable: false
|
||||
exportMetaObjectRevisions: [0]
|
||||
Enum {
|
||||
name: "LineType"
|
||||
values: {
|
||||
"NoPen": 0,
|
||||
"SolidLine": 1,
|
||||
"DashLine": 2,
|
||||
"DotLine": 3,
|
||||
"DashDotLine": 4,
|
||||
"DashDotDotLine": 5
|
||||
}
|
||||
}
|
||||
Property { name: "visible"; type: "bool" }
|
||||
Property { name: "subVisible"; type: "bool" }
|
||||
Property { name: "lineWidth"; type: "int" }
|
||||
Property { name: "lineColor"; type: "QColor" }
|
||||
Property { name: "lineType"; type: "LineType" }
|
||||
Property { name: "subLineWidth"; type: "int" }
|
||||
Property { name: "subLineColor"; type: "QColor" }
|
||||
Property { name: "subLineType"; type: "LineType" }
|
||||
Signal {
|
||||
name: "visibleChanged"
|
||||
Parameter { type: "bool" }
|
||||
}
|
||||
Signal {
|
||||
name: "subVisibleChanged"
|
||||
Parameter { type: "bool" }
|
||||
}
|
||||
Signal {
|
||||
name: "lineWidthChanged"
|
||||
Parameter { type: "int" }
|
||||
}
|
||||
Signal {
|
||||
name: "lineColorChanged"
|
||||
Parameter { type: "QColor" }
|
||||
}
|
||||
Signal {
|
||||
name: "lineTypeChanged"
|
||||
Parameter { type: "LineType" }
|
||||
}
|
||||
Signal {
|
||||
name: "subLineWidthChanged"
|
||||
Parameter { type: "int" }
|
||||
}
|
||||
Signal {
|
||||
name: "subLineColorChanged"
|
||||
Parameter { type: "QColor" }
|
||||
}
|
||||
Signal {
|
||||
name: "subLineTypeChanged"
|
||||
Parameter { type: "LineType" }
|
||||
}
|
||||
}
|
||||
Component {
|
||||
name: "QmlQCustomPlot::Ticker"
|
||||
prototype: "QObject"
|
||||
exports: ["FluentUI/Ticker 1.0"]
|
||||
isCreatable: false
|
||||
exportMetaObjectRevisions: [0]
|
||||
Property { name: "ticks"; type: "bool" }
|
||||
Property { name: "subTicks"; type: "bool" }
|
||||
Property { name: "tickCount"; type: "int" }
|
||||
Property { name: "baseWidth"; type: "int" }
|
||||
Property { name: "baseColor"; type: "QColor" }
|
||||
Property { name: "tickColor"; type: "QColor" }
|
||||
Property { name: "subTickColor"; type: "QColor" }
|
||||
Signal {
|
||||
name: "ticksChanged"
|
||||
Parameter { type: "bool" }
|
||||
}
|
||||
Signal {
|
||||
name: "subTicksChanged"
|
||||
Parameter { type: "bool" }
|
||||
}
|
||||
Signal {
|
||||
name: "tickCountChanged"
|
||||
Parameter { type: "int" }
|
||||
}
|
||||
Signal {
|
||||
name: "baseWidthChanged"
|
||||
Parameter { type: "int" }
|
||||
}
|
||||
Signal {
|
||||
name: "baseColorChanged"
|
||||
Parameter { type: "QColor" }
|
||||
}
|
||||
Signal {
|
||||
name: "tickColorChanged"
|
||||
Parameter { type: "QColor" }
|
||||
}
|
||||
Signal {
|
||||
name: "subTickColorChanged"
|
||||
Parameter { type: "QColor" }
|
||||
}
|
||||
}
|
||||
Component {
|
||||
name: "QmlQCustomPlot::TimePlot"
|
||||
defaultProperty: "data"
|
||||
prototype: "QmlQCustomPlot::BasePlot"
|
||||
exports: ["FluentUI/TimePlot 1.0"]
|
||||
exportMetaObjectRevisions: [0]
|
||||
Property { name: "plotTimeRangeInMilliseconds"; type: "int" }
|
||||
Signal {
|
||||
name: "plotTimeRangeInMillisecondsChanged"
|
||||
Parameter { type: "int" }
|
||||
}
|
||||
Method {
|
||||
name: "setTimeFormat"
|
||||
Parameter { name: "format"; type: "string" }
|
||||
}
|
||||
Method {
|
||||
name: "addCurrentTimeValue"
|
||||
Parameter { name: "name"; type: "string" }
|
||||
Parameter { name: "value"; type: "double" }
|
||||
}
|
||||
Method {
|
||||
name: "addCurrentTimeValues"
|
||||
Parameter { name: "values"; type: "QVariantMap" }
|
||||
}
|
||||
}
|
||||
Component {
|
||||
prototype: "QQuickItem"
|
||||
name: "FluentUI/FluAcrylic 1.0"
|
||||
@ -2746,37 +2511,37 @@ Module {
|
||||
Property { name: "darkClickListener"; type: "QVariant" }
|
||||
Property {
|
||||
name: "buttonStayTop"
|
||||
type: "FluIconButton_QMLTYPE_19"
|
||||
type: "FluIconButton_QMLTYPE_18"
|
||||
isReadonly: true
|
||||
isPointer: true
|
||||
}
|
||||
Property {
|
||||
name: "buttonMinimize"
|
||||
type: "FluIconButton_QMLTYPE_19"
|
||||
type: "FluIconButton_QMLTYPE_18"
|
||||
isReadonly: true
|
||||
isPointer: true
|
||||
}
|
||||
Property {
|
||||
name: "buttonMaximize"
|
||||
type: "FluIconButton_QMLTYPE_19"
|
||||
type: "FluIconButton_QMLTYPE_18"
|
||||
isReadonly: true
|
||||
isPointer: true
|
||||
}
|
||||
Property {
|
||||
name: "buttonClose"
|
||||
type: "FluIconButton_QMLTYPE_19"
|
||||
type: "FluIconButton_QMLTYPE_18"
|
||||
isReadonly: true
|
||||
isPointer: true
|
||||
}
|
||||
Property {
|
||||
name: "buttonDark"
|
||||
type: "FluIconButton_QMLTYPE_19"
|
||||
type: "FluIconButton_QMLTYPE_18"
|
||||
isReadonly: true
|
||||
isPointer: true
|
||||
}
|
||||
Property {
|
||||
name: "layoutMacosButtons"
|
||||
type: "FluLoader_QMLTYPE_11"
|
||||
type: "FluLoader_QMLTYPE_16"
|
||||
isReadonly: true
|
||||
isPointer: true
|
||||
}
|
||||
@ -3469,15 +3234,15 @@ Module {
|
||||
defaultProperty: "data"
|
||||
Property { name: "logo"; type: "QUrl" }
|
||||
Property { name: "title"; type: "string" }
|
||||
Property { name: "items"; type: "FluObject_QMLTYPE_176"; isPointer: true }
|
||||
Property { name: "footerItems"; type: "FluObject_QMLTYPE_176"; isPointer: true }
|
||||
Property { name: "items"; type: "FluObject_QMLTYPE_164"; isPointer: true }
|
||||
Property { name: "footerItems"; type: "FluObject_QMLTYPE_164"; isPointer: true }
|
||||
Property { name: "displayMode"; type: "int" }
|
||||
Property { name: "autoSuggestBox"; type: "QQmlComponent"; isPointer: true }
|
||||
Property { name: "actionItem"; type: "QQmlComponent"; isPointer: true }
|
||||
Property { name: "topPadding"; type: "int" }
|
||||
Property { name: "pageMode"; type: "int" }
|
||||
Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_48"; isPointer: true }
|
||||
Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_48"; isPointer: true }
|
||||
Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_36"; isPointer: true }
|
||||
Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_36"; isPointer: true }
|
||||
Property { name: "navCompactWidth"; type: "int" }
|
||||
Property { name: "navTopMargin"; type: "int" }
|
||||
Property { name: "cellHeight"; type: "int" }
|
||||
@ -3485,13 +3250,13 @@ Module {
|
||||
Property { name: "hideNavAppBar"; type: "bool" }
|
||||
Property {
|
||||
name: "buttonMenu"
|
||||
type: "FluIconButton_QMLTYPE_19"
|
||||
type: "FluIconButton_QMLTYPE_18"
|
||||
isReadonly: true
|
||||
isPointer: true
|
||||
}
|
||||
Property {
|
||||
name: "buttonBack"
|
||||
type: "FluIconButton_QMLTYPE_19"
|
||||
type: "FluIconButton_QMLTYPE_18"
|
||||
isReadonly: true
|
||||
isPointer: true
|
||||
}
|
||||
@ -3859,7 +3624,7 @@ Module {
|
||||
Method {
|
||||
name: "removeWindow"
|
||||
type: "QVariant"
|
||||
Parameter { name: "win"; type: "QVariant" }
|
||||
Parameter { name: "window"; type: "QVariant" }
|
||||
}
|
||||
Method {
|
||||
name: "exit"
|
||||
@ -4377,9 +4142,6 @@ Module {
|
||||
Property { name: "fixSize"; type: "bool" }
|
||||
Property { name: "loadingItem"; type: "QQmlComponent"; isPointer: true }
|
||||
Property { name: "fitsAppBarWindows"; type: "bool" }
|
||||
Property { name: "tintOpacity"; type: "QVariant" }
|
||||
Property { name: "blurRadius"; type: "int" }
|
||||
Property { name: "availableEffects"; type: "QVariant"; isReadonly: true }
|
||||
Property { name: "appBar"; type: "QQuickItem"; isPointer: true }
|
||||
Property { name: "backgroundColor"; type: "QColor" }
|
||||
Property { name: "stayTop"; type: "bool" }
|
||||
@ -4392,8 +4154,13 @@ Module {
|
||||
Property { name: "autoVisible"; type: "bool" }
|
||||
Property { name: "autoCenter"; type: "bool" }
|
||||
Property { name: "autoDestroy"; type: "bool" }
|
||||
|
||||
Property { name: "effect"; type: "string" }
|
||||
Property { name: "effective"; type: "bool" }
|
||||
Property { name: "blurRadius"; type: "int" }
|
||||
Property { name: "tintOpacity"; type: "QVariant" }
|
||||
|
||||
Property { name: "useSystemAppBar"; type: "bool" }
|
||||
Property { name: "__margins"; type: "int" }
|
||||
Property { name: "resizeBorderColor"; type: "QColor" }
|
||||
Property { name: "resizeBorderWidth"; type: "int" }
|
||||
Property { name: "closeListener"; type: "QVariant" }
|
||||
@ -4401,8 +4168,6 @@ Module {
|
||||
Property { name: "_route"; type: "string" }
|
||||
Property { name: "_hideShadow"; type: "bool" }
|
||||
Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
|
||||
Property { name: "effect"; type: "string" }
|
||||
Property { name: "effective"; type: "bool"; isReadonly: true }
|
||||
Signal {
|
||||
name: "initArgument"
|
||||
Parameter { name: "argument"; type: "QVariant" }
|
||||
@ -4440,6 +4205,11 @@ Module {
|
||||
Method { name: "clearAllInfo"; type: "QVariant" }
|
||||
Method { name: "moveWindowToDesktopCenter"; type: "QVariant" }
|
||||
Method { name: "fixWindowSize"; type: "QVariant" }
|
||||
Method {
|
||||
name: "registerForWindowResult"
|
||||
type: "QVariant"
|
||||
Parameter { name: "path"; type: "QVariant" }
|
||||
}
|
||||
Method {
|
||||
name: "setResult"
|
||||
type: "QVariant"
|
||||
@ -4459,8 +4229,6 @@ Module {
|
||||
type: "QVariant"
|
||||
Parameter { name: "val"; type: "QVariant" }
|
||||
}
|
||||
Method { name: "deleteLater"; type: "QVariant" }
|
||||
Method { name: "containerItem"; type: "QVariant" }
|
||||
}
|
||||
Component {
|
||||
prototype: "QQuickWindowQmlImpl"
|
||||
@ -4483,9 +4251,6 @@ Module {
|
||||
Property { name: "fixSize"; type: "bool" }
|
||||
Property { name: "loadingItem"; type: "QQmlComponent"; isPointer: true }
|
||||
Property { name: "fitsAppBarWindows"; type: "bool" }
|
||||
Property { name: "tintOpacity"; type: "QVariant" }
|
||||
Property { name: "blurRadius"; type: "int" }
|
||||
Property { name: "availableEffects"; type: "QVariant"; isReadonly: true }
|
||||
Property { name: "appBar"; type: "QQuickItem"; isPointer: true }
|
||||
Property { name: "backgroundColor"; type: "QColor" }
|
||||
Property { name: "stayTop"; type: "bool" }
|
||||
@ -4499,7 +4264,6 @@ Module {
|
||||
Property { name: "autoCenter"; type: "bool" }
|
||||
Property { name: "autoDestroy"; type: "bool" }
|
||||
Property { name: "useSystemAppBar"; type: "bool" }
|
||||
Property { name: "__margins"; type: "int" }
|
||||
Property { name: "resizeBorderColor"; type: "QColor" }
|
||||
Property { name: "resizeBorderWidth"; type: "int" }
|
||||
Property { name: "closeListener"; type: "QVariant" }
|
||||
@ -4507,8 +4271,6 @@ Module {
|
||||
Property { name: "_route"; type: "string" }
|
||||
Property { name: "_hideShadow"; type: "bool" }
|
||||
Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
|
||||
Property { name: "effect"; type: "string" }
|
||||
Property { name: "effective"; type: "bool"; isReadonly: true }
|
||||
Signal {
|
||||
name: "initArgument"
|
||||
Parameter { name: "argument"; type: "QVariant" }
|
||||
@ -4546,6 +4308,11 @@ Module {
|
||||
Method { name: "clearAllInfo"; type: "QVariant" }
|
||||
Method { name: "moveWindowToDesktopCenter"; type: "QVariant" }
|
||||
Method { name: "fixWindowSize"; type: "QVariant" }
|
||||
Method {
|
||||
name: "registerForWindowResult"
|
||||
type: "QVariant"
|
||||
Parameter { name: "path"; type: "QVariant" }
|
||||
}
|
||||
Method {
|
||||
name: "setResult"
|
||||
type: "QVariant"
|
||||
@ -4565,8 +4332,6 @@ Module {
|
||||
type: "QVariant"
|
||||
Parameter { name: "val"; type: "QVariant" }
|
||||
}
|
||||
Method { name: "deleteLater"; type: "QVariant" }
|
||||
Method { name: "containerItem"; type: "QVariant" }
|
||||
}
|
||||
Component {
|
||||
prototype: "QQuickItem"
|
||||
|
||||
@ -16,7 +16,7 @@ Window {
|
||||
property int blurRadius: 60
|
||||
property alias effect: frameless.effect
|
||||
readonly property alias effective: frameless.effective
|
||||
readonly property alias availableEffects: frameless.availableEffects
|
||||
readonly property var availableEffects: frameless.availableEffects
|
||||
property Item appBar: FluAppBar {
|
||||
title: window.title
|
||||
height: 30
|
||||
@ -113,8 +113,6 @@ Window {
|
||||
fixSize: window.fixSize
|
||||
topmost: window.stayTop
|
||||
disabled: FluApp.useSystemAppBar
|
||||
isDarkMode: FluTheme.dark
|
||||
useSystemEffect: !FluTheme.blurBehindWindowEnabled
|
||||
Component.onCompleted: {
|
||||
frameless.setHitTestVisible(appBar.layoutMacosButtons)
|
||||
frameless.setHitTestVisible(appBar.layoutStandardbuttons)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user