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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-05-13 18:28:28 +08:00
parent 2367c6978a
commit 876b230141
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/qml/window/MainWindow.qml
View File

@ -14,9 +14,9 @@ FluWindow {
id:window id:window
title: "FluentUI" title: "FluentUI"
width: 1000 width: 1000
height: 680 height: 668
minimumWidth: 800 minimumWidth: 668
minimumHeight: 200 minimumHeight: 320
launchMode: FluWindowType.SingleTask launchMode: FluWindowType.SingleTask
fitsAppBarWindows: true fitsAppBarWindows: true
appBar: FluAppBar { appBar: FluAppBar {

4
example/src/component/OpenGLItem.cpp
View File

@ -2,6 +2,7 @@
#include <QOpenGLFramebufferObjectFormat> #include <QOpenGLFramebufferObjectFormat>
#include <QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
#include <QQuickWindow>
class FBORenderer : public QQuickFramebufferObject::Renderer, protected QOpenGLFunctions { class FBORenderer : public QQuickFramebufferObject::Renderer, protected QOpenGLFunctions {
public: public:
@ -47,6 +48,7 @@ QOpenGLFramebufferObject *FBORenderer::createFramebufferObject(const QSize &size
} }
void FBORenderer::render() { void FBORenderer::render() {
auto pixelRatio = item->window()->devicePixelRatio();
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@ -61,7 +63,7 @@ void FBORenderer::render() {
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
program.setAttributeArray(0, GL_FLOAT, values, 2); program.setAttributeArray(0, GL_FLOAT, values, 2);
program.setUniformValue("t", (float) item->t()); program.setUniformValue("t", (float) item->t());
glViewport(0, 0, qRound(item->width()), qRound(item->height())); glViewport(0, 0, qRound(item->width()*pixelRatio), qRound(item->height()*pixelRatio));
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE); glBlendFunc(GL_SRC_ALPHA, GL_ONE);

15
src/CMakeLists.txt
View File

@ -11,6 +11,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.cmake/)
#配置通用编译 #配置通用编译
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if (QT_VERSION VERSION_GREATER_EQUAL "6.3")
qt_standard_project_setup()
else ()
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
endif ()
#设置版本号 #设置版本号
add_definitions(-DFLUENTUI_VERSION=1,7,5,0) add_definitions(-DFLUENTUI_VERSION=1,7,5,0)
@ -35,14 +42,6 @@ if (NOT FLUENTUI_QML_PLUGIN_DIRECTORY)
set(FLUENTUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/FluentUI) set(FLUENTUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/FluentUI)
endif () endif ()
if (QT_VERSION VERSION_GREATER_EQUAL "6.3")
qt_standard_project_setup()
else ()
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
endif ()
#国际化 #国际化
find_program(QT_LUPDATE NAMES lupdate) find_program(QT_LUPDATE NAMES lupdate)
find_program(QT_LRELEASE NAMES lrelease) find_program(QT_LRELEASE NAMES lrelease)

6
src/FluFrameless.cpp
View File

@ -131,10 +131,14 @@ void FluFrameless::componentComplete() {
setShadow(hwnd); setShadow(hwnd);
} }
#endif #endif
h = qRound(h + _appbar->height()); auto appBarHeight = _appbar->height();
h = qRound(h + appBarHeight);
if (_fixSize) { if (_fixSize) {
window()->setMaximumSize(QSize(w, h)); window()->setMaximumSize(QSize(w, h));
window()->setMinimumSize(QSize(w, h)); window()->setMinimumSize(QSize(w, h));
}else{
window()->setMinimumHeight(window()->minimumHeight()+appBarHeight);
window()->setMaximumHeight(window()->maximumHeight()+appBarHeight);
} }
window()->resize(QSize(w, h)); window()->resize(QSize(w, h));
connect(this, &FluFrameless::topmostChanged, this, [this] { connect(this, &FluFrameless::topmostChanged, this, [this] {

4
src/Qt5/imports/FluentUI/Controls/FluTableView.qml
View File

@ -499,8 +499,8 @@ Rectangle {
} }
readonly property bool isHeaderHorizontal: TableView.view == header_horizontal readonly property bool isHeaderHorizontal: TableView.view == header_horizontal
readonly property bool isHide: { readonly property bool isHide: {
if(isHeaderHorizontal && columnModel.frozen){ if(isHeaderHorizontal){
return true return false
} }
if(!isHeaderHorizontal){ if(!isHeaderHorizontal){
if(currentTableView.dataIndex !== columnModel.dataIndex) if(currentTableView.dataIndex !== columnModel.dataIndex)

4
src/Qt6/imports/FluentUI/Controls/FluTableView.qml
View File

@ -499,8 +499,8 @@ Rectangle {
} }
readonly property bool isHeaderHorizontal: TableView.view == header_horizontal readonly property bool isHeaderHorizontal: TableView.view == header_horizontal
readonly property bool isHide: { readonly property bool isHide: {
if(isHeaderHorizontal && columnModel.frozen){ if(isHeaderHorizontal){
return true return false
} }
if(!isHeaderHorizontal){ if(!isHeaderHorizontal){
if(currentTableView.dataIndex !== columnModel.dataIndex) if(currentTableView.dataIndex !== columnModel.dataIndex)