Merge pull request #10 from ganyuanzhen/main

修复屏幕旋转&修复qrc
LingmoOS · Mar 3, 2024 · ad60ea8 · ad60ea8
2 parents c98f8cb + b37c96d
commit ad60ea8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/qml/Display/Main.qml b/src/qml/Display/Main.qml
@@ -223,6 +223,7 @@ ItemPage {
                                         id: rotationLayout
                                         anchors.fill: parent
                                         spacing: 0
+                                        property int current_rot: element.rotation
 
                                         RotationButton {
                                             value: 0
@@ -262,7 +263,7 @@ ItemPage {
                                 CheckBox {
                                     id: enabledBox
                                     checked: element.enabled
-                                    // visible: _screenView.count > 1
+                                    visible: _screenView.count > 1
                                     onClicked: {
                                         element.enabled = checked
                                         screen.save()

diff --git a/src/qml/Display/RotationButton.qml b/src/qml/Display/RotationButton.qml
@@ -28,16 +28,18 @@ IconCheckBox {
     property int value
     property var rot
 
-    checked: element.rotation === rot
+    checked: rotationLayout.current_rot === rot
 
     onClicked: {
         if (element.rotation === rot) {
             return;
         }
 
-        element.rotation = rot
+        element.rotation = rot;
+        rotationLayout.current_rot = rot;
+        // 下面不需要了
         // screen.resetTotalSize()
-        screen.save()
+        // screen.save()
     }
 
     Component.onCompleted: {

diff --git a/src/resources.qrc b/src/resources.qrc
@@ -163,5 +163,6 @@
         <file>qml/Update/UpdateItemsView.qml</file>
         <file>qml/Update/UpdateItem.qml</file>
         <file>qml/Update/UpdateTitleBar.qml</file>
+        <file>qml/Update/Version.js</file>
     </qresource>
 </RCC>