iOS: Further tweaks for mobile

2 files changed, 27 insertions, 1 deletions

diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index 34efba67..448103b5 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -137,7 +137,7 @@ static void draw_ScrollWidget_(const iScrollWidget *d) {
     if (bounds.size.x > 0) {
         iPaint p;
         init_Paint(&p);
-        drawVLine_Paint(&p, topLeft_Rect(bounds), height_Rect(bounds), uiSeparator_ColorId);
+        //drawVLine_Paint(&p, topLeft_Rect(bounds), height_Rect(bounds), uiSeparator_ColorId);
         const iRect thumbRect = shrunk_Rect(
             thumbRect_ScrollWidget_(d), init_I2(isPressed ? gap_UI : (gap_UI * 4 / 3), gap_UI / 2));
         fillRect_Paint(&p, thumbRect, isPressed ? uiBackgroundPressed_ColorId : tmQuote_ColorId);
diff --git a/src/ui/window.c b/src/ui/window.c
index 75dffb56..38df8682 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -136,6 +136,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
 #endif
 
 #if !defined (iHaveNativeMenus)
+#if !defined (iPlatformAppleMobile)
 /* TODO: Submenus wouldn't hurt here. */
 static const iMenuItem navMenuItems_[] = {
     { "New Tab", 't', KMOD_PRIMARY, "tabs.new" },
@@ -162,6 +163,31 @@ static const iMenuItem navMenuItems_[] = {
     { "---", 0, 0, NULL },
     { "Quit Lagrange", 'q', KMOD_PRIMARY, "quit" }
 };
+#else
+static const iMenuItem navMenuItems_[] = {
+    { "New Tab", 't', KMOD_PRIMARY, "tabs.new" },
+    { "Close Tab", 'w', KMOD_PRIMARY, "tabs.close" },
+    { "---", 0, 0, NULL },
+    { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
+    { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
+    { "---", 0, 0, NULL },
+    { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
+    { "Toggle Right Sidebar", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" },
+    { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
+    { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
+    { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
+    { "---", 0, 0, NULL },
+    { "List All Bookmarks", 0, 0, "!open url:about:bookmarks" },
+    { "List Bookmarks by Tag", 0, 0, "!open url:about:bookmarks?tags" },
+    { "List Bookmarks by Creation Time", 0, 0, "!open url:about:bookmarks?created" },
+    { "---", 0, 0, NULL },
+    { "Show Feed Entries", 0, 0, "!open url:about:feeds" },
+    { "---", 0, 0, NULL },
+    { "Preferences...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
+    { "Help", SDLK_F1, 0, "!open url:about:help" },
+    { "Release Notes", 0, 0, "!open url:about:version" },
+};
+#endif /* AppleMobile */
 #endif
 
 #if defined (iHaveNativeMenus)