Merge branch 'master' into stable24

pulsejet · Nov 12, 2022 · 76b7120 · 76b7120
2 parents 67ec5a3 + 4203676
commit 76b7120
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -310,15 +310,21 @@ body {
 // Nextcloud 25+: get rid of gap and border radius at right
 #content-vue.remove-gap {
   // was var(--body-container-radius)
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-
+  // now set on #app-navigation-vue
+  border-radius: 0;
   width: calc(100% - var(--body-container-margin) * 1); // was *2
 }
 
 // Prevent content overflow on NC <25
 #content-vue {
   max-height: 100vh;
+
+  // https://bugs.webkit.org/show_bug.cgi?id=160953
+  overflow: visible;
+  #app-navigation-vue {
+    border-top-left-radius: var(--body-container-radius);
+    border-bottom-left-radius: var(--body-container-radius);
+  }
 }
 
 // Top bar is above everything else on mobile
@@ -331,23 +337,6 @@ body.has-viewer header {
   z-index: 0 !important;
 }
 
-// Patch viewer to remove the title and
-// make the image fill the entire screen
-.viewer {
-  .modal-title {
-    display: none;
-  }
-  .modal-wrapper .modal-container {
-    top: 0 !important;
-    bottom: 0 !important;
-
-    .viewer__image-editor {
-      top: 0 !important;
-      bottom: 0 !important;
-    }
-  }
-}
-
 // Hide horizontal scrollbar on mobile
 // For the padding removal above
 #app-content-vue {

diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
@@ -277,8 +277,9 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   }
 
   /** Clicking on photo */
-  public clickPhoto(photo: IPhoto, event: any, rowIdx: number) {
+  public clickPhoto(photo: IPhoto, event: PointerEvent, rowIdx: number) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
+    if (event.pointerType === "touch") return; // let touch events handle this
 
     if (this.has()) {
       if (event.shiftKey) {
@@ -292,7 +293,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   }
 
   /** Tap on */
-  protected touchstartPhoto(photo: IPhoto, event: any, rowIdx: number) {
+  protected touchstartPhoto(photo: IPhoto, event: TouchEvent, rowIdx: number) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
     this.rows[rowIdx].virtualSticky = true;
 
@@ -311,9 +312,11 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
   }
 
   /** Tap off */
-  protected touchendPhoto(photo: IPhoto, event: any, rowIdx: number) {
+  protected touchendPhoto(photo: IPhoto, event: TouchEvent, rowIdx: number) {
     if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
     delete this.rows[rowIdx].virtualSticky;
+
+    if (this.touchTimer) this.clickPhoto(photo, {} as any, rowIdx);
     this.resetTouchParams();
 
     window.setTimeout(() => {
@@ -337,7 +340,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
    * Tap over
    * photo and rowIdx are that of the *anchor*
    */
-  protected touchmovePhoto(anchor: IPhoto, event: any, rowIdx: number) {
+  protected touchmovePhoto(anchor: IPhoto, event: TouchEvent, rowIdx: number) {
     if (anchor.flag & this.c.FLAG_PLACEHOLDER) return;
 
     if (this.touchTimer) {