Remove loading screen

Author: emilk

crates/re_viewer/src/app.rs

@@ -731,10 +731,11 @@ impl App {
                         render_ctx.before_submit();
                     }
                 } else {
-                    // This is part of the loading vs. welcome screen UI logic. The loading screen
-                    // is displayed when no app ID is set. This is e.g. the initial state for the
-                    // web demos.
-                    crate::ui::loading_ui(ui, &self.rx);
+                    // There's nothing to show.
+                    // We get here when
+                    // A) there is nothing loaded
+                    // B) we decided not to show the welcome screen, presumably because data is expected at any time now.
+                    // The user can see the connection status in the top bar.
                 }
             });
     }
@@ -941,12 +942,13 @@ impl App {
         }
     }
 
-    /// This function will create an empty blueprint whenever the welcome screen should be
-    /// displayed.
-    ///
-    /// The welcome screen can be displayed only when a blueprint is available (and no recording is
-    /// loaded). This function implements the heuristic which determines when the welcome screen
+    /// This function implements a heuristic which determines when the welcome screen
     /// should show up.
+    ///
+    /// Why not always show it when no data is loaded?
+    /// Because sometimes we expet data to arrive at any moment,
+    /// and showing the wlecome screen for a few frames will just be an annoying flash
+    /// in the users face.
     fn should_show_welcome_screen(&mut self, store_hub: &StoreHub) -> bool {
         // Don't show the welcome screen if we have actual data to display.
         if store_hub.current_recording().is_some() || store_hub.selected_application_id().is_some()

crates/re_viewer/src/ui/mod.rs

@@ -17,5 +17,5 @@ pub use recordings_panel::recordings_panel_ui;
 
 pub(crate) use {
     self::mobile_warning_ui::mobile_warning_ui, self::top_panel::top_panel,
-    self::welcome_screen::loading_ui, self::welcome_screen::WelcomeScreen,
+    self::welcome_screen::WelcomeScreen,
 };

crates/re_viewer/src/ui/welcome_screen/mod.rs

@@ -1,12 +1,14 @@
 mod example_page;
 mod welcome_page;
 
+use std::hash::Hash;
+
 use egui::Widget;
+use welcome_page::welcome_page_ui;
+
 use re_log_types::LogMsg;
-use re_smart_channel::{ReceiveSet, SmartChannelSource};
+use re_smart_channel::ReceiveSet;
 use re_ui::ReUi;
-use std::hash::Hash;
-use welcome_page::welcome_page_ui;
 
 #[derive(Debug, Default, PartialEq, Hash)]
 enum WelcomeScreenPage {
@@ -104,39 +106,6 @@ impl WelcomeScreen {
     }
 }
 
-/// Full-screen UI shown while in loading state.
-pub fn loading_ui(ui: &mut egui::Ui, rx: &ReceiveSet<LogMsg>) {
-    let status_strings = status_strings(rx);
-    if status_strings.is_empty() {
-        return;
-    }
-
-    ui.centered_and_justified(|ui| {
-        for status_string in status_strings {
-            let style = ui.style();
-            let mut layout_job = egui::text::LayoutJob::default();
-            layout_job.append(
-                status_string.status,
-                0.0,
-                egui::TextFormat::simple(
-                    egui::TextStyle::Heading.resolve(style),
-                    style.visuals.strong_text_color(),
-                ),
-            );
-            layout_job.append(
-                &format!("\n\n{}", status_string.source),
-                0.0,
-                egui::TextFormat::simple(
-                    egui::TextStyle::Body.resolve(style),
-                    style.visuals.text_color(),
-                ),
-            );
-            layout_job.halign = egui::Align::Center;
-            ui.label(layout_job);
-        }
-    });
-}
-
 fn set_large_button_style(ui: &mut egui::Ui) {
     ui.style_mut().spacing.button_padding = egui::vec2(10.0, 7.0);
     let visuals = ui.visuals_mut();
@@ -182,64 +151,3 @@ fn large_text_button(ui: &mut egui::Ui, text: impl Into<egui::WidgetText>) -> eg
     })
     .inner
 }
-
-/// Describes the current state of the Rerun viewer.
-struct StatusString {
-    /// General status string (e.g. "Ready", "Loading…", etc.).
-    status: &'static str,
-
-    /// Source string (e.g. listening IP, file path, etc.).
-    source: String,
-
-    /// Whether or not the status is valid once data loading is completed, i.e. if data may still
-    /// be received later.
-    long_term: bool,
-}
-
-impl StatusString {
-    fn new(status: &'static str, source: String, long_term: bool) -> Self {
-        Self {
-            status,
-            source,
-            long_term,
-        }
-    }
-}
-
-/// Returns the status strings to be displayed by the loading and welcome screen.
-fn status_strings(rx: &ReceiveSet<LogMsg>) -> Vec<StatusString> {
-    rx.sources()
-        .into_iter()
-        .map(|s| status_string(&s))
-        .collect()
-}
-
-fn status_string(source: &SmartChannelSource) -> StatusString {
-    match source {
-        re_smart_channel::SmartChannelSource::File(path) => {
-            StatusString::new("Loading…", path.display().to_string(), false)
-        }
-        re_smart_channel::SmartChannelSource::RrdHttpStream { url } => {
-            StatusString::new("Loading…", url.clone(), false)
-        }
-        re_smart_channel::SmartChannelSource::RrdWebEventListener => {
-            StatusString::new("Ready", "Waiting for logging data…".to_owned(), true)
-        }
-        re_smart_channel::SmartChannelSource::Sdk => StatusString::new(
-            "Ready",
-            "Waiting for logging data from SDK".to_owned(),
-            true,
-        ),
-        re_smart_channel::SmartChannelSource::WsClient { ws_server_url } => {
-            // TODO(emilk): it would be even better to know whether or not we are connected, or are attempting to connect
-            StatusString::new(
-                "Ready",
-                format!("Waiting for data from {ws_server_url}"),
-                true,
-            )
-        }
-        re_smart_channel::SmartChannelSource::TcpServer { port } => {
-            StatusString::new("Ready", format!("Listening on port {port}"), true)
-        }
-    }
-}

crates/re_viewer/src/ui/welcome_screen/welcome_page.rs

@@ -1,4 +1,4 @@
-use super::{large_text_button, status_strings, url_large_text_button, WelcomeScreenResponse};
+use super::{large_text_button, url_large_text_button, WelcomeScreenResponse};
 use egui::{NumExt, Ui};
 use re_data_store::StoreDb;
 use re_log_types::{
@@ -46,23 +46,7 @@ pub(super) fn welcome_page_ui(
 ) -> WelcomeScreenResponse {
     ui.vertical(|ui| {
         let accepts_connections = rx.accepts_tcp_connections();
-
-        let show_example = onboarding_content_ui(ui, command_sender, accepts_connections);
-
-        for status_strings in status_strings(rx) {
-            if status_strings.long_term {
-                ui.add_space(55.0);
-                ui.vertical_centered(|ui| {
-                    ui.label(status_strings.status);
-                    ui.label(
-                        egui::RichText::new(status_strings.source)
-                            .color(ui.visuals().weak_text_color()),
-                    );
-                });
-            }
-        }
-
-        show_example
+        onboarding_content_ui(ui, command_sender, accepts_connections)
     })
     .inner
 }