iOS: More spacing for lists

3 files changed, 21 insertions, 11 deletions

diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index 2130400c..fe53c595 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -26,6 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "util.h"
 #include "command.h"
 #include "visbuf.h"
+#include "app.h"
 
 #include <the_Foundation/intset.h>
 
@@ -136,6 +137,9 @@ void updateVisible_ListWidget(iListWidget *d) {
 
 void setItemHeight_ListWidget(iListWidget *d, int itemHeight) {
     d->itemHeight = itemHeight;
+    if (deviceType_App() != desktop_AppDeviceType) {
+        d->itemHeight += gap_UI;
+    }
     invalidate_ListWidget(d);
 }
 
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 8c39793e..505b85f9 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -102,6 +102,17 @@ static iBool isStationary_Touch_(const iTouch *d) {
            length_F3(sub_F3(d->pos[0], d->startPos)) < tapRadiusPt_ * get_Window()->pixelRatio;
 }
 
+static void dispatchMotion_Touch_(iFloat3 pos, int buttonState) {
+    dispatchEvent_Widget(get_Window()->root, (SDL_Event *) &(SDL_MouseMotionEvent){
+        .type = SDL_MOUSEMOTION,
+        .timestamp = SDL_GetTicks(),
+        .which = SDL_TOUCH_MOUSEID,
+        .state = buttonState,
+        .x = x_F3(pos),
+        .y = y_F3(pos)
+    });
+}
+
 static void dispatchClick_Touch_(const iTouch *d, int button) {
     const iFloat3 tapPos = d->pos[0];
     SDL_MouseButtonEvent btn = {
@@ -120,6 +131,7 @@ static void dispatchClick_Touch_(const iTouch *d, int button) {
     btn.state = SDL_RELEASED;
     btn.timestamp = SDL_GetTicks();
     dispatchEvent_Widget(get_Window()->root, (SDL_Event *) &btn);
+    dispatchMotion_Touch_(zero_F3(), 0);
 }
 
 static void clearWidgetMomentum_TouchState_(iTouchState *d, iWidget *widget) {
@@ -188,17 +200,6 @@ static void update_TouchState_(void *ptr) {
     }
 }
 
-static void dispatchMotion_Touch_(iFloat3 pos, int buttonState) {
-    dispatchEvent_Widget(get_Window()->root, (SDL_Event *) &(SDL_MouseMotionEvent){
-        .type = SDL_MOUSEMOTION,
-        .timestamp = SDL_GetTicks(),
-        .which = SDL_TOUCH_MOUSEID,
-        .state = buttonState,
-        .x = x_F3(pos),
-        .y = y_F3(pos)
-    });
-}
-
 static void dispatchButtonUp_Touch_(iFloat3 pos) {
     dispatchEvent_Widget(get_Window()->root, (SDL_Event *) &(SDL_MouseButtonEvent){
         .type = SDL_MOUSEBUTTONUP,
diff --git a/src/ui/window.c b/src/ui/window.c
index c096c00b..4d6a197a 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -540,6 +540,11 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                 iInputWidget *url = findChild_Widget(navBar, "url");
                 setTextCStr_InputWidget(url, suffixPtr_Command(cmd, "url"));
                 checkLoadAnimation_Window_(get_Window());
+                if (deviceType_App() == phone_AppDeviceType && isPortrait_App()) {
+                    if (isVisible_Widget(findWidget_App("sidebar"))) {
+                        postCommand_App("sidebar.toggle");
+                    }
+                }
                 return iFalse;
             }
         }