Browse Source

Fix Qt warnings

resolve binding loo in `SyncState`
move `updateCostPerMeter` function to root of `MaterialView` such that it is available of all sub components

Cura 8687
casper 3 years ago
parent
commit
f957cc289e

+ 2 - 2
resources/qml/Account/SyncState.qml

@@ -82,8 +82,8 @@ Row // Sync state icon + message
             id: stateLabel
             // text is determined by State
             font: UM.Theme.getFont("medium")
-            width: contentWidth + UM.Theme.getSize("default_margin").height
-            height: contentHeight
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("default_margin").width
             visible: !Cura.API.account.manualSyncEnabled && !Cura.API.account.updatePackagesEnabled
         }
 

+ 6 - 6
resources/qml/Preferences/Materials/MaterialsView.qml

@@ -420,12 +420,6 @@ Item
 
             Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
         }
-
-        function updateCostPerMeter()
-        {
-            base.spoolLength = calculateSpoolLength(diameterSpinBox.value, densitySpinBox.value, spoolWeightSpinBox.value);
-            base.costPerMeter = calculateCostPerMeter(spoolCostSpinBox.value);
-        }
     }
 
     ListView
@@ -518,6 +512,12 @@ Item
         }
     }
 
+    function updateCostPerMeter()
+    {
+        base.spoolLength = calculateSpoolLength(diameterSpinBox.value, densitySpinBox.value, spoolWeightSpinBox.value);
+        base.costPerMeter = calculateCostPerMeter(spoolCostSpinBox.value);
+    }
+
     function calculateSpoolLength(diameter, density, spoolWeight)
     {
         if(!diameter)