From d93f6f25d20b231fe6c75e3b8d40d158d5c35ff5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Nov 2019 10:47:53 +0100 Subject: [PATCH 1/2] Prevent "sticky" tooltips When quickly moving the mouse in and out, the timer would still be running, so the tooltip would become active once the mouse moved out of the area. --- .../Recommended/RecommendedQualityProfileSelector.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 7c527f9448..337aff573f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -174,7 +174,11 @@ Item } onEntered: intentTooltipTimer.start() - onExited: base.hideTooltip() + onExited: + { + base.hideTooltip() + intentTooltipTimer.stop() + } } NoIntentIcon // This icon has hover priority over intentDescriptionHoverArea, so draw it above it. From e2414ed5c94ce8776f6b3b1a771da50c888b24f4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Nov 2019 15:58:39 +0100 Subject: [PATCH 2/2] Also log the exception when the connection failed to connect --- cura/OAuth2/AuthorizationHelpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/OAuth2/AuthorizationHelpers.py b/cura/OAuth2/AuthorizationHelpers.py index 08309fa30e..9fc01ba50b 100644 --- a/cura/OAuth2/AuthorizationHelpers.py +++ b/cura/OAuth2/AuthorizationHelpers.py @@ -99,7 +99,7 @@ class AuthorizationHelpers: }) except requests.exceptions.ConnectionError: # Connection was suddenly dropped. Nothing we can do about that. - Logger.log("w", "Something failed while attempting to parse the JWT token") + Logger.logException("w", "Something failed while attempting to parse the JWT token") return None if token_request.status_code not in (200, 201): Logger.log("w", "Could not retrieve token data from auth server: %s", token_request.text)