update

zhuzichu520 · May 13, 2024 · 876b230 · 876b230
1 parent 2367c69
commit 876b230
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml
@@ -14,9 +14,9 @@ FluWindow {
     id:window
     title: "FluentUI"
     width: 1000
-    height: 680
-    minimumWidth: 800
-    minimumHeight: 200
+    height: 668
+    minimumWidth: 668
+    minimumHeight: 320
     launchMode: FluWindowType.SingleTask
     fitsAppBarWindows: true
     appBar: FluAppBar {

diff --git a/example/src/component/OpenGLItem.cpp b/example/src/component/OpenGLItem.cpp
@@ -2,6 +2,7 @@
 
 #include <QOpenGLFramebufferObjectFormat>
 #include <QOpenGLShaderProgram>
+#include <QQuickWindow>
 
 class FBORenderer : public QQuickFramebufferObject::Renderer, protected QOpenGLFunctions {
 public:
@@ -47,6 +48,7 @@ QOpenGLFramebufferObject *FBORenderer::createFramebufferObject(const QSize &size
 }
 
 void FBORenderer::render() {
+    auto pixelRatio = item->window()->devicePixelRatio();
     glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
     glEnable(GL_DEPTH_TEST);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -61,7 +63,7 @@ void FBORenderer::render() {
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     program.setAttributeArray(0, GL_FLOAT, values, 2);
     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);
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,6 +11,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.cmake/)
 #配置通用编译
 set(CMAKE_CXX_STANDARD 17)
 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)
@@ -35,14 +42,6 @@ if (NOT FLUENTUI_QML_PLUGIN_DIRECTORY)
     set(FLUENTUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/FluentUI)
 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_LRELEASE NAMES lrelease)

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

diff --git a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
@@ -499,8 +499,8 @@ Rectangle {
             }
             readonly property bool isHeaderHorizontal: TableView.view == header_horizontal
             readonly property bool isHide: {
-                if(isHeaderHorizontal && columnModel.frozen){
-                    return true
+                if(isHeaderHorizontal){
+                    return false
                 }
                 if(!isHeaderHorizontal){
                     if(currentTableView.dataIndex !== columnModel.dataIndex)

diff --git a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
@@ -499,8 +499,8 @@ Rectangle {
             }
             readonly property bool isHeaderHorizontal: TableView.view == header_horizontal
             readonly property bool isHide: {
-                if(isHeaderHorizontal && columnModel.frozen){
-                    return true
+                if(isHeaderHorizontal){
+                    return false
                 }
                 if(!isHeaderHorizontal){
                     if(currentTableView.dataIndex !== columnModel.dataIndex)