From cceedfac155d538365228eecbd0a87c2760064ba Mon Sep 17 00:00:00 2001 From: Alex Wennerberg Date: Fri, 18 Sep 2020 14:44:31 -0700 Subject: [PATCH] Emoji Favicons (#90) --- display/bookmarks.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/display/bookmarks.go b/display/bookmarks.go index 68d819f..2f292ab 100644 --- a/display/bookmarks.go +++ b/display/bookmarks.go @@ -71,7 +71,7 @@ func bkmkInit() { // It also accepts a bool indicating whether this page already has a bookmark. // It returns the bookmark name and the bookmark action: // 1, 0, -1 for add/update, cancel, and remove -func openBkmkModal(name string, exists bool) (string, int) { +func openBkmkModal(name string, exists bool, favicon string) (string, int) { // Basically a copy of Input() // Reset buttons before input field, to make sure the input is in focus @@ -86,6 +86,9 @@ func openBkmkModal(name string, exists bool) (string, int) { // Remove and re-add input field - to clear the old text bkmkModal.GetForm().Clear(false) + if favicon != "" && !exists { + name = favicon + " " + name + } bkmkModalText = "" bkmkModal.GetForm().AddInputField("Name: ", name, 0, nil, func(text string) { @@ -136,10 +139,10 @@ func addBookmark() { // Can't make bookmarks for other kinds of URLs return } - - name, exists := bookmarks.Get(tabs[curTab].page.URL) + curPage := tabs[curTab].page + name, exists := bookmarks.Get(curPage.URL) // Open a bookmark modal with the current name of the bookmark, if it exists - newName, action := openBkmkModal(name, exists) + newName, action := openBkmkModal(name, exists, curPage.Favicon) switch action { case 1: // Add/change the bookmark