Merge pull request #12573 from Ultimaker/CURA-8849_more_intent_fixes

[CURA-8849] more intent fixes

1 files changed, 16 insertions, 15 deletions

diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
index 74c496f824..8d31d6292d 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
@@ -13,7 +13,7 @@ import Cura 1.0 as Cura
 Item
 {
     id: enableAdhesionRow
-    height: childrenRect.height
+    height: enableAdhesionContainer.height
 
     property real labelColumnWidth: Math.round(width / 3)
     property var curaRecommendedMode: Cura.RecommendedMode {}
@@ -47,8 +47,6 @@ Item
             id: enableAdhesionCheckBox
             anchors.verticalCenter: parent.verticalCenter
 
-            property alias _hovered: adhesionMouseArea.containsMouse
-
             //: Setting enable printing build-plate adhesion helper checkbox
             enabled: recommendedPrintSetup.settingsEnabled
 
@@ -60,22 +58,25 @@ Item
                 id: adhesionMouseArea
                 anchors.fill: parent
                 hoverEnabled: true
-
-                onClicked:
-                {
-                    curaRecommendedMode.setAdhesion(!parent.checked)
-                }
-
-                onEntered:
-                {
-                    base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0),
-                        catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards."));
-                }
-                onExited: base.hideTooltip()
+                // propagateComposedEvents used on adhesionTooltipMouseArea does not work with Controls Components.
+                // It only works with other MouseAreas, so this is required
+                onClicked: curaRecommendedMode.setAdhesion(!parent.checked)
             }
         }
     }
 
+    MouseArea
+    {
+        id: adhesionTooltipMouseArea
+        anchors.fill: parent
+        propagateComposedEvents: true
+        hoverEnabled: true
+
+        onEntered:base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0),
+                catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards."));
+        onExited: base.hideTooltip()
+    }
+
     UM.SettingPropertyProvider
     {
         id: platformAdhesionType