update

zhuzichu520 · Apr 23, 2024 · cb44759 · cb44759
1 parent 04c52b1
commit cb44759
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 133 deletions.
diff --git a/example/example.qrc b/example/example.qrc
@@ -180,7 +180,6 @@
         <file>qml/window/PageWindow.qml</file>
         <file>qml/page/T_StaggeredLayout.qml</file>
         <file>qml/page/T_Clip.qml</file>
-        <file>qml/page/T_3D.qml</file>
         <file>qml/page/T_Network.qml</file>
         <file>qml/page/T_ShortcutPicker.qml</file>
         <file>qml/chart/T_BarChart.qml</file>

diff --git a/example/example_en_US.ts b/example/example_en_US.ts
@@ -515,11 +515,6 @@
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="487"/>
-        <source>3D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="493"/>
         <source>Test Crash</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts
@@ -514,12 +514,11 @@
         <translation type="unfinished">热加载</translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="487"/>
         <source>3D</source>
-        <translation type="unfinished">3D</translation>
+        <translation type="obsolete">3D</translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="493"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="487"/>
         <source>Test Crash</source>
         <translation type="unfinished">测试崩溃</translation>
     </message>

diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml
@@ -483,12 +483,6 @@ FluObject{
                 FluRouter.navigate("/hotload")
             }
         }
-        FluPaneItem{
-            title: qsTr("3D")
-            menuDelegate: paneItemMenu
-            url: "qrc:/example/qml/page/T_3D.qml"
-            onTap: { navigationView.push(url) }
-        }
         FluPaneItem{
             title: qsTr("Test Crash")
             onTapListener: function(){

diff --git a/example/qml/page/T_3D.qml b/example/qml/page/T_3D.qml
diff --git a/src/FluFrameless.cpp b/src/FluFrameless.cpp
@@ -270,8 +270,10 @@ void FluFrameless::componentComplete() {
         auto geometry = window()->screen()->availableGeometry();
         RECT rect;
         SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
-        minmaxInfo->ptMinTrackSize.x = window()->minimumWidth() * pixelRatio + offsetXY.x();
-        minmaxInfo->ptMinTrackSize.y = window()->minimumHeight() * pixelRatio + offsetXY.y() + _appbar->height() * pixelRatio;
+        if(!_fixSize){
+            minmaxInfo->ptMinTrackSize.x = window()->minimumWidth() * pixelRatio + offsetXY.x();
+            minmaxInfo->ptMinTrackSize.y = window()->minimumHeight() * pixelRatio + offsetXY.y() + _appbar->height() * pixelRatio;
+        }
         minmaxInfo->ptMaxPosition.x = rect.left - offsetXY.x();
         minmaxInfo->ptMaxPosition.y = rect.top - offsetXY.x();
         minmaxInfo->ptMaxSize.x = qRound(geometry.width() * pixelRatio) + offsetXY.x() * 2;