From 13c8ad97c6cbef98caee574dd55103db5021653c Mon Sep 17 00:00:00 2001 From: Jaakko Keränen Date: Wed, 17 Mar 2021 21:54:36 +0200 Subject: Moved "Find on page" menu item Mobile "Find on page" is now in the nav menu. Added icons to sidebar toggle items. --- src/ui/documentwidget.c | 5 ----- src/ui/text.c | 1 - src/ui/window.c | 12 +++++++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c index 592470eb..83f270bd 100644 --- a/src/ui/documentwidget.c +++ b/src/ui/documentwidget.c @@ -2549,11 +2549,6 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e { "---", 0, 0, NULL }, { "Copy Page URL", 0, 0, "document.copylink" } }, 12); - if (deviceType_App() != desktop_AppDeviceType) { - /* TODO: Perhaps not the best place for this? */ - insert_Array(&items, size_Array(&items) - 3, - &(iMenuItem){ magnifyingGlass_Icon " Find on page", 0, 0, "focus.set id:find.input" }); - } if (isEmpty_Range(&d->selectMark)) { pushBackN_Array( &items, diff --git a/src/ui/text.c b/src/ui/text.c index 5163d14a..8107b886 100644 --- a/src/ui/text.c +++ b/src/ui/text.c @@ -994,7 +994,6 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) { const iColor clr = get_Color(colorNum); SDL_SetTextureColorMod(text_.cache, clr.r, clr.g, clr.b); if (args->mode & fillBackground_RunMode) { - printf("draw color: [%d] %d,%d,%d\n", colorNum, clr.r, clr.g, clr.b); SDL_SetRenderDrawColor(text_.render, clr.r, clr.g, clr.b, 0); } } diff --git a/src/ui/window.c b/src/ui/window.c index 5d5b8e0c..1c0c0394 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -194,8 +194,8 @@ static const iMenuItem navMenuItems_[] = { { download_Icon " 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" }, + { leftHalf_Icon " Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, + { rightHalf_Icon " 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" }, @@ -218,8 +218,9 @@ static const iMenuItem tabletNavMenuItems_[] = { { add_Icon " New Tab", 't', KMOD_PRIMARY, "tabs.new" }, { close_Icon " Close Tab", 'w', KMOD_PRIMARY, "tabs.close" }, { "---", 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" }, + { magnifyingGlass_Icon " Find on page", 0, 0, "focus.set id:find.input" }, + { leftHalf_Icon " Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, + { rightHalf_Icon " 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" }, @@ -238,7 +239,8 @@ static const iMenuItem phoneNavMenuItems_[] = { { add_Icon " New Tab", 't', KMOD_PRIMARY, "tabs.new" }, { close_Icon " Close Tab", 'w', KMOD_PRIMARY, "tabs.close" }, { "---", 0, 0, NULL }, - { "Toggle Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, + { magnifyingGlass_Icon " Find on page", 0, 0, "focus.set id:find.input" }, + { leftHalf_Icon " Toggle Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.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" }, -- cgit v1.2.3