diff --git a/src/app/browser.cpp b/src/app/browser.cpp index c92e1b71..1db8ec36 100644 --- a/src/app/browser.cpp +++ b/src/app/browser.cpp @@ -104,15 +104,17 @@ Browser::Browser( // Tab page navigation actions add_action( "main_tab_page_navigation_update", - [this] + [this](const bool & ADD_HISTORY = false) { - browserMain->tab_page_navigation_update(); + browserMain->tab_page_navigation_update( + ADD_HISTORY + ); } ); add_action( "main_tab_page_navigation_history_try_back", - [this] + [this]() { browserMain->tab_page_navigation_history_try_back(); } diff --git a/src/app/browser/main.cpp b/src/app/browser/main.cpp index 74cc711b..b4f3f477 100644 --- a/src/app/browser/main.cpp +++ b/src/app/browser/main.cpp @@ -74,10 +74,12 @@ void Main::tab_close_all() mainTab->close_all(); }; -void Main::tab_page_navigation_update() -{ +void Main::tab_page_navigation_update( + const bool & ADD_HISTORY +) { mainTab->page_navigation_update( - mainTab->get_current_page() + mainTab->get_current_page(), + ADD_HISTORY ); }; diff --git a/src/app/browser/main.hpp b/src/app/browser/main.hpp index 7ba4ba7b..960c01c5 100644 --- a/src/app/browser/main.hpp +++ b/src/app/browser/main.hpp @@ -38,7 +38,10 @@ namespace app::browser void tab_close_right(); void tab_close(); - void tab_page_navigation_update(); + void tab_page_navigation_update( + const bool & ADD_HISTORY + ); + bool tab_page_navigation_history_try_back(); bool tab_page_navigation_history_try_forward(); diff --git a/src/app/browser/main/tab.cpp b/src/app/browser/main/tab.cpp index 77b5f463..2eb04193 100644 --- a/src/app/browser/main/tab.cpp +++ b/src/app/browser/main/tab.cpp @@ -108,11 +108,14 @@ void Tab::close_all() } void Tab::page_navigation_update( - const int & PAGE_NUMBER + const int & PAGE_NUMBER, + const bool & ADD_HISTORY ) { get_tabPage( PAGE_NUMBER - )->navigation_update(); + )->navigation_update( + ADD_HISTORY + ); } bool Tab::page_navigation_history_try_back( diff --git a/src/app/browser/main/tab.hpp b/src/app/browser/main/tab.hpp index 9c04f7cf..00085d42 100644 --- a/src/app/browser/main/tab.hpp +++ b/src/app/browser/main/tab.hpp @@ -59,7 +59,8 @@ namespace app::browser::main void close_all(); void page_navigation_update( - const int & PAGE_NUMBER + const int & PAGE_NUMBER, + const bool & ADD_HISTORY ); bool page_navigation_history_try_back( diff --git a/src/app/browser/main/tab/page.cpp b/src/app/browser/main/tab/page.cpp index 393c3099..6cd5bce4 100644 --- a/src/app/browser/main/tab/page.cpp +++ b/src/app/browser/main/tab/page.cpp @@ -234,7 +234,9 @@ void Page::navigation_update( "gemini://" + pageNavigation->get_request_text() ); - navigation_update(); + navigation_update( + false + ); } else diff --git a/src/app/browser/main/tab/page.hpp b/src/app/browser/main/tab/page.hpp index a6a56f49..0c5ca31c 100644 --- a/src/app/browser/main/tab/page.hpp +++ b/src/app/browser/main/tab/page.hpp @@ -60,7 +60,7 @@ namespace app::browser::main::tab ); void navigation_update( - const bool & ADD_HISTORY = false + const bool & ADD_HISTORY ); bool navigation_history_try_back(); diff --git a/src/app/browser/main/tab/page/navigation.cpp b/src/app/browser/main/tab/page/navigation.cpp index 53a478ca..975415ec 100644 --- a/src/app/browser/main/tab/page/navigation.cpp +++ b/src/app/browser/main/tab/page/navigation.cpp @@ -97,9 +97,9 @@ bool Navigation::history_try_back() match.request ); - navigationUpdate->activate(); - - return true; + return activate_action( + "win.main_tab_page_navigation_update" + ); } return false; @@ -115,9 +115,9 @@ bool Navigation::history_try_forward() match.request ); - navigationUpdate->activate(); - - return true; + return activate_action( + "win.main_tab_page_navigation_update" + ); } return false;