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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-12-28 22:55:38 +08:00
parent 823721ab8c
commit 2d1957afe3
7 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/macos.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [macos-13] os: [macos-13]
qt_ver: [6.6.0] qt_ver: [6.6.1]
qt_arch: [clang_64] qt_arch: [clang_64]
env: env:
targetName: example targetName: example
@ -50,7 +50,7 @@ jobs:
cmake --version cmake --version
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/6.6.0/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/6.6.1/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake --build . --target all --config Release --parallel cmake --build . --target all --config Release --parallel
- name: package - name: package

4
.github/workflows/ubuntu.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-20.04] os: [ubuntu-20.04]
qt_ver: [6.6.0] qt_ver: [6.6.1]
qt_arch: [gcc_64] qt_arch: [gcc_64]
env: env:
targetName: example targetName: example
@ -55,7 +55,7 @@ jobs:
cmake --version cmake --version
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/6.6.0/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/6.6.1/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake --build . --target all --config Release --parallel cmake --build . --target all --config Release --parallel
- name: install QT linux deploy - name: install QT linux deploy

4
.github/workflows/windows-mingw.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
os: [windows-2022] os: [windows-2022]
include: include:
- qt_arch: win64_mingw - qt_arch: win64_mingw
qt_ver: 6.6.0 qt_ver: 6.6.1
qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900" qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900"
qt_tools_mingw_install: mingw900_64 qt_tools_mingw_install: mingw900_64
env: env:
@ -69,7 +69,7 @@ jobs:
mkdir build mkdir build
cd build cd build
ninja --version ninja --version
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.6.0\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.6.1\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake --build . --target all --config Release --parallel cmake --build . --target all --config Release --parallel
- name: package - name: package

4
.github/workflows/windows.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
matrix: matrix:
os: [windows-2019] os: [windows-2019]
include: include:
- qt_ver: 6.6.0 - qt_ver: 6.6.1
qt_arch: win64_msvc2019_64 qt_arch: win64_msvc2019_64
msvc_arch: x64 msvc_arch: x64
qt_arch_install: msvc2019_64 qt_arch_install: msvc2019_64
@ -52,7 +52,7 @@ jobs:
ninja --version ninja --version
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.6.0\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.6.1\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake --build . --target all --config Release --parallel cmake --build . --target all --config Release --parallel
echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV% echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV%
echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV% echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV%

2
src/FluColorSet.h
View File

@ -2,6 +2,7 @@
#define FLUCOLORSET_H #define FLUCOLORSET_H
#include <QObject> #include <QObject>
#include <QtQml/qqml.h>
#include "stdafx.h" #include "stdafx.h"
/** /**
@ -17,6 +18,7 @@ class FluColorSet : public QObject
Q_PROPERTY_AUTO(QString,light) Q_PROPERTY_AUTO(QString,light)
Q_PROPERTY_AUTO(QString,lighter) Q_PROPERTY_AUTO(QString,lighter)
Q_PROPERTY_AUTO(QString,lightest) Q_PROPERTY_AUTO(QString,lightest)
QML_NAMED_ELEMENT(FluColorSet)
public: public:
explicit FluColorSet(QObject *parent = nullptr); explicit FluColorSet(QObject *parent = nullptr);
}; };

16
src/FluColors.cpp
View File

@ -27,7 +27,7 @@ FluColors::FluColors(QObject *parent):QObject{parent}{
Grey210("#161514"); Grey210("#161514");
Grey220("#11100f"); Grey220("#11100f");
FluColorSet *yellow = new FluColorSet(); FluColorSet *yellow = new FluColorSet(this);
yellow->darkest("#f9a825"); yellow->darkest("#f9a825");
yellow->darker("#fbc02d"); yellow->darker("#fbc02d");
yellow->dark("#fdd435"); yellow->dark("#fdd435");
@ -37,7 +37,7 @@ FluColors::FluColors(QObject *parent):QObject{parent}{
yellow->lightest("#fff59b"); yellow->lightest("#fff59b");
Yellow(yellow); Yellow(yellow);
FluColorSet *orange = new FluColorSet(); FluColorSet *orange = new FluColorSet(this);
orange->darkest("#993d07"); orange->darkest("#993d07");
orange->darker("#ac4408"); orange->darker("#ac4408");
orange->dark("#d1580a"); orange->dark("#d1580a");
@ -47,7 +47,7 @@ FluColors::FluColors(QObject *parent):QObject{parent}{
orange->lightest("#fac06a"); orange->lightest("#fac06a");
Orange(orange); Orange(orange);
FluColorSet *red = new FluColorSet(); FluColorSet *red = new FluColorSet(this);
red->darkest("#8f0a15"); red->darkest("#8f0a15");
red->darker("#a20b18"); red->darker("#a20b18");
red->dark("#b90d1c"); red->dark("#b90d1c");
@ -57,7 +57,7 @@ FluColors::FluColors(QObject *parent):QObject{parent}{
red->lightest("#f06b76"); red->lightest("#f06b76");
Red(red); Red(red);
FluColorSet *magenta = new FluColorSet(); FluColorSet *magenta = new FluColorSet(this);
magenta->darkest("#6f004f"); magenta->darkest("#6f004f");
magenta->darker("#a0076c"); magenta->darker("#a0076c");
magenta->dark("#b50d7d"); magenta->dark("#b50d7d");
@ -67,7 +67,7 @@ FluColors::FluColors(QObject *parent):QObject{parent}{
magenta->lightest("#f18cd5"); magenta->lightest("#f18cd5");
Magenta(magenta); Magenta(magenta);
FluColorSet *purple = new FluColorSet(); FluColorSet *purple = new FluColorSet(this);
purple->darkest("#2c0f76"); purple->darkest("#2c0f76");
purple->darker("#3d0f99"); purple->darker("#3d0f99");
purple->dark("#4e11ae"); purple->dark("#4e11ae");
@ -77,7 +77,7 @@ FluColors::FluColors(QObject *parent):QObject{parent}{
purple->lightest("#9e8ed9"); purple->lightest("#9e8ed9");
Purple(purple); Purple(purple);
FluColorSet *blue = new FluColorSet(); FluColorSet *blue = new FluColorSet(this);
blue->darkest("#004A83"); blue->darkest("#004A83");
blue->darker("#005494"); blue->darker("#005494");
blue->dark("#0066B4"); blue->dark("#0066B4");
@ -87,7 +87,7 @@ FluColors::FluColors(QObject *parent):QObject{parent}{
blue->lightest("#60ABE4"); blue->lightest("#60ABE4");
Blue(blue); Blue(blue);
FluColorSet *teal = new FluColorSet(); FluColorSet *teal = new FluColorSet(this);
teal->darkest("#006E5B"); teal->darkest("#006E5B");
teal->darker("#007C67"); teal->darker("#007C67");
teal->dark("#00977D"); teal->dark("#00977D");
@ -97,7 +97,7 @@ FluColors::FluColors(QObject *parent):QObject{parent}{
teal->lightest("#60CFBC"); teal->lightest("#60CFBC");
Teal(teal); Teal(teal);
FluColorSet *green = new FluColorSet(); FluColorSet *green = new FluColorSet(this);
green->darkest("#094C09"); green->darkest("#094C09");
green->darker("#0C5D0C"); green->darker("#0C5D0C");
green->dark("#0E6F0E"); green->dark("#0E6F0E");

5
src/FluFramelessHelper.cpp
View File

@ -234,10 +234,7 @@ void FluFramelessHelper::componentComplete(){
} }
if(!window.isNull()){ if(!window.isNull()){
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#if (QT_VERSION == QT_VERSION_CHECK(6, 5, 3)) window->setFlags(window->flags() | Qt::FramelessWindowHint | Qt::WindowMinimizeButtonHint);
window->setFlag(Qt::FramelessWindowHint,true);
#endif
window->setFlag(Qt::WindowMinimizeButtonHint,true);
_nativeEvent =new FramelessEventFilter(this); _nativeEvent =new FramelessEventFilter(this);
qApp->installNativeEventFilter(_nativeEvent); qApp->installNativeEventFilter(_nativeEvent);
HWND hwnd = reinterpret_cast<HWND>(window->winId()); HWND hwnd = reinterpret_cast<HWND>(window->winId());