Fix video actions when swipe is enabled.

walokra · Nov 15, 2021 · a9700df · a9700df
1 parent 31b071a
commit a9700df
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 32 deletions.
diff --git a/main.cpp b/main.cpp
@@ -45,6 +45,8 @@ int main(int argc, char *argv[])
 
     SimpleCrypt *crypto = new SimpleCrypt();
     crypto->setKey(0xd2fa13b37d936b07);
+    //QString secret = crypto->encryptToString(QString(""));
+    //qDebug() << "secret:" << secret;
     QString client_secret = crypto->decryptToString(QString(CLIENT_SECRET));
 
     QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));

diff --git a/qml/pages/ImageComponent.qml b/qml/pages/ImageComponent.qml
@@ -12,9 +12,6 @@ Component {
         height: Math.max(image.height, 3 * loadingImageIndicator.height);
         width: Screen.width;
 
-        property int start_x;
-        property int start_y;
-
         AnimatedImage {
             id: image;
 

diff --git a/qml/pages/VideoComponent.qml b/qml/pages/VideoComponent.qml
@@ -81,37 +81,35 @@ Component {
             internal.clickPlay();
         }
 
-        MouseArea {
-            property int start_x;
-            property int start_y;
+        property int start_x;
+        property int start_y;
 
-            anchors.fill: parent;
+        anchors.fill: parent;
 
-            onPressAndHold: {
-                video.height = (video.height < drawerContextMenu.height) ? drawerContextMenu.height : video.height;
-                drawer.open = true;
-            }
+        onPressAndHold: {
+            video.height = (video.height < drawerContextMenu.height) ? drawerContextMenu.height : video.height;
+            drawer.open = true;
+        }
 
-            onPressed: {
-                start_x = mouseX;
-                start_y = mouseY;
-            }
+        onPressed: {
+            start_x = mouseX;
+            start_y = mouseY;
+        }
+
+        onPositionChanged: {
+            var x_diff = mouseX - start_x;
+            var y_diff = mouseY - start_y;
+
+            var abs_x_diff = Math.abs(x_diff);
+            var abs_y_diff = Math.abs(y_diff);
 
-            onPositionChanged: {
-                var x_diff = mouseX - start_x;
-                var y_diff = mouseY - start_y;
-
-                var abs_x_diff = Math.abs(x_diff);
-                var abs_y_diff = Math.abs(y_diff);
-
-                if (abs_x_diff != abs_y_diff) {
-                    if (abs_x_diff > abs_y_diff) {
-                        if (abs_x_diff > 50) {
-                            if (x_diff > 0) {
-                                if (prevEnabled) { galleryNavigation.previous(); }
-                            } else if (x_diff < 0) {
-                                galleryNavigation.next();
-                            }
+            if (abs_x_diff != abs_y_diff) {
+                if (abs_x_diff > abs_y_diff) {
+                    if (abs_x_diff > 50) {
+                        if (x_diff > 0) {
+                            if (prevEnabled) { galleryNavigation.previous(); }
+                        } else if (x_diff < 0) {
+                            galleryNavigation.next();
                         }
                     }
                 }

diff --git a/rpm/harbour-sailimgur.changes b/rpm/harbour-sailimgur.changes
@@ -1,3 +1,6 @@
+* Mon Nov 15 2021 Marko Wallin <[email protected]> 0.11.1-1
+Fix video actions.
+
 * Mon Nov 15 2021 Marko Wallin <[email protected]> 0.11.0-1
 Fix animations (videos, gifs) behaviour, #28.
 Fix back button, #29.

diff --git a/rpm/harbour-sailimgur.spec b/rpm/harbour-sailimgur.spec
@@ -13,7 +13,7 @@ Name:       harbour-sailimgur
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Sailimgur is an Imgur app for Sailfish OS, powered by Qt and QML
-Version:    0.11.0
+Version:    0.11.1
 Release:    1
 Group:      Applications/Internet
 License:    GPLv3

diff --git a/rpm/harbour-sailimgur.yaml b/rpm/harbour-sailimgur.yaml
@@ -1,6 +1,6 @@
 Name: harbour-sailimgur
 Summary: Sailimgur is an Imgur app for Sailfish OS, powered by Qt and QML
-Version: 0.11.0
+Version: 0.11.1
 Release: 1
 Group: Applications/Internet
 URL: http://ruleoftech.com/lab/sailimgur