From 7255fe6cd7b6b5d4a158d715c48cfa55935f27db Mon Sep 17 00:00:00 2001 From: CodeCrafter912 Date: Wed, 18 Jul 2018 14:50:23 +0200 Subject: [PATCH] Fixed tone on IOS Fixed bug that made the button getting out of the screen if the screen was too thin --- main.qml | 8 ++++---- speedclimbing_stopwatch.pro | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/main.qml b/main.qml index b68c626..5488874 100644 --- a/main.qml +++ b/main.qml @@ -80,7 +80,7 @@ Window { } height: parent.height - (parent.height * 0.5) - width: height + width: height > parent.width ? parent.width * 0.8:height color: "white" border.color: "grey" border.width: 1 @@ -151,16 +151,16 @@ Window { ] transitions: [ Transition { - NumberAnimation { properties: "height,bottomMargin,font.pixelSize"; easing.type: Easing.InOutQuad; duration: 700 } + NumberAnimation { properties: "height,width,bottomMargin,font.pixelSize"; easing.type: Easing.InOutQuad; duration: 700 } FadeAnimation { target: time; fadeDuration_in: 0; fadeDuration_out: 0 } }, Transition { to: "STOPPED" - NumberAnimation { properties: "height,bottomMargin,font.pixelSize"; easing.type: Easing.InOutQuad; duration: 700 } + NumberAnimation { properties: "height,width,bottomMargin,font.pixelSize"; easing.type: Easing.InOutQuad; duration: 700 } }, Transition { to: "IDLE" - NumberAnimation { properties: "height,bottomMargin,font.pixelSize"; easing.type: Easing.InOutQuad; duration: 700 } + NumberAnimation { properties: "height,width,bottomMargin,font.pixelSize"; easing.type: Easing.InOutQuad; duration: 700 } FadeAnimation { target: time; fadeDuration_out: 1000; fadeDuration_in: 0} }, diff --git a/speedclimbing_stopwatch.pro b/speedclimbing_stopwatch.pro index 9bf2c99..24c11c3 100644 --- a/speedclimbing_stopwatch.pro +++ b/speedclimbing_stopwatch.pro @@ -26,6 +26,9 @@ QML_IMPORT_PATH = # Additional import path used to resolve QML modules just for Qt Quick Designer QML_DESIGNER_IMPORT_PATH = +#Plugins +QTPLUGIN += qtaudio_coreaudio + # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin