diff --git a/src/app/browser.cpp b/src/app/browser.cpp index 98b1ef00..c92e1b71 100644 --- a/src/app/browser.cpp +++ b/src/app/browser.cpp @@ -106,7 +106,7 @@ Browser::Browser( "main_tab_page_navigation_update", [this] { - browserMain->tab_page_update(); + browserMain->tab_page_navigation_update(); } ); diff --git a/src/app/browser/main.cpp b/src/app/browser/main.cpp index e15b382d..74cc711b 100644 --- a/src/app/browser/main.cpp +++ b/src/app/browser/main.cpp @@ -74,9 +74,9 @@ void Main::tab_close_all() mainTab->close_all(); }; -void Main::tab_page_update() +void Main::tab_page_navigation_update() { - mainTab->page_update( + mainTab->page_navigation_update( mainTab->get_current_page() ); }; diff --git a/src/app/browser/main.hpp b/src/app/browser/main.hpp index 2f495926..7ba4ba7b 100644 --- a/src/app/browser/main.hpp +++ b/src/app/browser/main.hpp @@ -30,18 +30,19 @@ namespace app::browser Glib::ustring get_current_tab_page_subtitle(); // Actions - void tab_append(); - void tab_close_all(); - void tab_close_left(); - void tab_close_right(); - void tab_close(); - - void tab_page_update(); - - bool tab_page_navigation_history_try_back(); - bool tab_page_navigation_history_try_forward(); - void refresh(); + + void tab_append(); + void tab_close_all(); + void tab_close_left(); + void tab_close_right(); + void tab_close(); + + void tab_page_navigation_update(); + 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 c90d6205..5a8e37e5 100644 --- a/src/app/browser/main/tab.cpp +++ b/src/app/browser/main/tab.cpp @@ -37,6 +37,18 @@ Glib::ustring Tab::get_page_subtitle( }; // Actions +void Tab::refresh( + const int & PAGE_NUMBER +) { + auto tabPage = get_tabPage( + PAGE_NUMBER + ); + + get_tabLabel(PAGE_NUMBER)->set_label( + tabPage->get_title() + ); +} + void Tab::append( const Glib::ustring & TITLE, const Glib::ustring & REQUEST, @@ -96,6 +108,14 @@ void Tab::close_all() } } +void Tab::page_navigation_update( + const int & PAGE_NUMBER +) { + get_tabPage( + PAGE_NUMBER + )->navigation_update(); +} + bool Tab::page_navigation_history_try_back( const int & PAGE_NUMBER ) { @@ -112,26 +132,6 @@ bool Tab::page_navigation_history_try_forward( )->navigation_history_try_forward(); } -void Tab::refresh( - const int & PAGE_NUMBER -) { - auto tabPage = get_tabPage( - PAGE_NUMBER - ); - - get_tabLabel(PAGE_NUMBER)->set_label( - tabPage->get_title() - ); -} - -void Tab::page_update( - const int & PAGE_NUMBER -) { - get_tabPage( - PAGE_NUMBER - )->update(); -} - // Private helpers tab::Label * Tab::get_tabLabel( const int & PAGE_NUMBER diff --git a/src/app/browser/main/tab.hpp b/src/app/browser/main/tab.hpp index f272801b..9c04f7cf 100644 --- a/src/app/browser/main/tab.hpp +++ b/src/app/browser/main/tab.hpp @@ -58,17 +58,17 @@ namespace app::browser::main void close_right(); void close_all(); - void page_update( + void page_navigation_update( const int & PAGE_NUMBER ); - bool page_navigation_history_try_back( - const int & PAGE_NUMBER - ); + bool page_navigation_history_try_back( + const int & PAGE_NUMBER + ); - bool page_navigation_history_try_forward( - const int & PAGE_NUMBER - ); + bool page_navigation_history_try_forward( + const int & PAGE_NUMBER + ); }; } diff --git a/src/app/browser/main/tab/page.cpp b/src/app/browser/main/tab/page.cpp index 9c735174..cde207c3 100644 --- a/src/app/browser/main/tab/page.cpp +++ b/src/app/browser/main/tab/page.cpp @@ -84,7 +84,7 @@ void Page::refresh( ); } -void Page::update( +void Page::navigation_update( const bool & HISTORY ) { // Update navigation history @@ -244,7 +244,7 @@ void Page::update( "gemini://" + pageNavigation->get_request_text() ); - update(); + navigation_update(); } else diff --git a/src/app/browser/main/tab/page.hpp b/src/app/browser/main/tab/page.hpp index de93ba7b..e0bb1db8 100644 --- a/src/app/browser/main/tab/page.hpp +++ b/src/app/browser/main/tab/page.hpp @@ -62,7 +62,7 @@ namespace app::browser::main::tab const double & PROGRESS ); - void update( + void navigation_update( const bool & HISTORY = false ); };