Browse Source

remove extra constructions

CPP-GTK4
yggverse 4 months ago
parent
commit
41650a9775
  1. 35
      src/app/browser/main/tab/page.cpp
  2. 4
      src/app/browser/main/tab/page.hpp

35
src/app/browser/main/tab/page.cpp

@ -179,26 +179,7 @@ void Page::navigation_reload( @@ -179,26 +179,7 @@ void Page::navigation_reload(
progress_fraction = 0;
// Begin progress listener in main thread (as this method use async data loader)
Glib::signal_timeout().connect(
[this]() -> bool
{
// Page update in progress..
if (progress_fraction < 1)
{
return true; // continue
}
// Page update completed, reset progress_fraction anyway
progress_fraction = 0;
// Activate window update action
action__update->signal_activate();
return false; // stop iteration
},
500 // @TODO add timeout
);
action__update->activate();
// Connect scheme driver
if ("file" == pageNavigation->get_request_scheme())
@ -237,6 +218,8 @@ void Page::navigation_reload( @@ -237,6 +218,8 @@ void Page::navigation_reload(
progress_fraction = .25;
action__update->activate();
try
{
GioSocketConnection = GioSocketClient->connect_to_uri_finish(
@ -252,6 +235,8 @@ void Page::navigation_reload( @@ -252,6 +235,8 @@ void Page::navigation_reload(
description = EXCEPTION.what();
progress_fraction = 1;
action__update->activate();
}
// Connection established, begin request
@ -275,6 +260,8 @@ void Page::navigation_reload( @@ -275,6 +260,8 @@ void Page::navigation_reload(
progress_fraction = .5;
action__update->activate();
// Response
GioSocketConnection->get_input_stream()->read_async( // | read_all_async
buffer,
@ -292,6 +279,8 @@ void Page::navigation_reload( @@ -292,6 +279,8 @@ void Page::navigation_reload(
progress_fraction = .75;
action__update->activate();
// Parse meta
auto meta = Glib::Regex::split_simple(
R"regex(^(\d+)?\s([\w]+\/[\w]+)?)regex",
@ -317,6 +306,8 @@ void Page::navigation_reload( @@ -317,6 +306,8 @@ void Page::navigation_reload(
progress_fraction = .8;
action__update->activate();
pageContent->set_text_gemini( // @TODO
buffer
);
@ -330,6 +321,8 @@ void Page::navigation_reload( @@ -330,6 +321,8 @@ void Page::navigation_reload(
description = _("MIME type not supported");
progress_fraction = 1;
action__update->activate();
}
}
@ -344,6 +337,8 @@ void Page::navigation_reload( @@ -344,6 +337,8 @@ void Page::navigation_reload(
);
progress_fraction = 1;
action__update->activate();
}
GioSocketConnection->close();

4
src/app/browser/main/tab/page.hpp

@ -86,9 +86,7 @@ namespace app::browser::main::tab @@ -86,9 +86,7 @@ namespace app::browser::main::tab
Glib::ustring description;
// Tools
double progress_fraction; // Page preparation status, wanted for following needs:
// * indication widgets (progress bar)
// * toggle window update action in main thread (e.g. on async data loading complete)
double progress_fraction; // async load indication (progress bar)
// Actions
Glib::RefPtr<Gio::SimpleAction> action__update;

Loading…
Cancel
Save