From 37ef58eb0426814a1bc8419a3d3e9c09a17052d2 Mon Sep 17 00:00:00 2001
From: jelveh <nj@puter.com>
Date: Sat, 14 Dec 2024 20:32:34 -0800
Subject: [PATCH] make Launcher mobile-friendly

---
 src/gui/src/UI/UITaskbar.js     |  2 +-
 src/gui/src/UI/UITaskbarItem.js |  8 +++++
 src/gui/src/css/style.css       | 60 ++++++++++++++++++++++++++++++---
 3 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/src/gui/src/UI/UITaskbar.js b/src/gui/src/UI/UITaskbar.js
index ae6b3d34..17224340 100644
--- a/src/gui/src/UI/UITaskbar.js
+++ b/src/gui/src/UI/UITaskbar.js
@@ -65,7 +65,7 @@ async function UITaskbar(options){
 
             // show popover
             let popover = UIPopover({
-                content: `<div class="launch-popover hide-scrollbar"><span class="close-launch-popover">✕</span></div>`,
+                content: `<div class="launch-popover hide-scrollbar"></div>`,
                 snapToElement: item,
                 parent_element: item,
                 width: 500,
diff --git a/src/gui/src/UI/UITaskbarItem.js b/src/gui/src/UI/UITaskbarItem.js
index 1503d13d..7da82b46 100644
--- a/src/gui/src/UI/UITaskbarItem.js
+++ b/src/gui/src/UI/UITaskbarItem.js
@@ -77,6 +77,14 @@ function UITaskbarItem(options){
     $(el_taskbar_item).on("click", function(e){
         e.preventDefault();
         e.stopPropagation();
+        
+        // if this is for the launcher popover, and it's mobile, and has-open-popover, close the popover
+        if( $(el_taskbar_item).attr('data-name') === 'Start'
+             && (isMobile.phone || isMobile.tablet) && $(el_taskbar_item).hasClass('has-open-popover')){
+            console.log('closing popover');
+            $('.popover').remove();
+            return;
+        }
 
         // If this item has an open context menu, don't do anything
         if($(el_taskbar_item).hasClass('has-open-contextmenu'))
diff --git a/src/gui/src/css/style.css b/src/gui/src/css/style.css
index 84c744ca..45588874 100644
--- a/src/gui/src/css/style.css
+++ b/src/gui/src/css/style.css
@@ -2602,8 +2602,8 @@ label {
 }
 
 .device-phone .popover {
-    height: 100vh;
-    height: 100dvh;
+    height: calc(100vh - 65px);
+    height: calc(100dvh - 65px);
     top: 0 !important;
     left: 0 !important;
     width: 100%;
@@ -2740,9 +2740,8 @@ label {
 
 .close-launch-popover {
     position: absolute;
-    top: 5px;
-    right: 10px;
-    padding: 5px;
+    top: 2px;
+    right: 3px;
     display: none;
 }
 
@@ -4560,3 +4559,54 @@ fieldset[name=number-code] {
 .device-phone .popover-launcher, .device-phone .launch-popover{
     border-radius: 0;
 }
+
+/* Main launcher container */
+.device-phone .launch-popover {
+    /* Enable smooth scrolling on iOS */
+    -webkit-overflow-scrolling: touch;
+    /* Allow vertical touch scrolling while preventing horizontal */
+    touch-action: pan-y;
+    /* Base dimensions */
+    width: 100%;
+    height: 100vh;
+    height: 100dvh;
+    
+    /* Scrolling behavior */
+    overflow-y: scroll;
+    overflow-x: hidden;
+    /* Background and styling */
+    background-color: rgba(231, 238, 245);
+    padding: 0;
+    margin: 0;
+    /* Hide scrollbars while keeping functionality */
+    scrollbar-width: none;
+    -ms-overflow-style: none;
+}
+
+/* Hide scrollbar while keeping functionality */
+.device-phone .launch-popover::-webkit-scrollbar {
+    display: none;
+}
+
+/* Ensure content can receive touch events */
+.device-phone .launch-popover * {
+    touch-action: pan-y;
+}
+
+/* Make sure the search wrapper doesn't interfere with scrolling */
+.device-phone .launch-search-wrapper {
+    position: sticky;
+    top: 0;
+    z-index: 1;
+    background: rgba(231, 238, 245);
+}
+
+.device-phone .popover-launcher{
+    left: 50% !important;
+    border-radius: 10px;
+    top: 5px !important;
+    transform: translateX(-50%);
+    width: calc(100% - 25px);
+    height: calc(100vh - 65px);
+    height: calc(100dvh - 65px);
+}
\ No newline at end of file