diff --git a/podcasts-gtk/src/stacks/home.rs b/podcasts-gtk/src/stacks/home.rs index 9dce4cd..fd86085 100644 --- a/podcasts-gtk/src/stacks/home.rs +++ b/podcasts-gtk/src/stacks/home.rs @@ -34,7 +34,7 @@ impl HomeStack { let stack = gtk::Stack::new(); let state = State::Empty; - stack.add_named(episodes.container(), "home"); + stack.add_named(episodes.view.container(), "home"); stack.add_named(&empty.container, "empty"); let mut home = HomeStack { @@ -67,14 +67,14 @@ impl HomeStack { fn replace_view(&mut self) -> Result<(), Error> { // Get the container of the view - let old = &self.episodes.container().clone(); + let old = &self.episodes.view.container().clone(); let eps = HomeView::new(self.sender.clone())?; // Remove the old widget and add the new one // during this the previous view is removed, // and the visible child falls back to empty view. self.stack.remove(old); - self.stack.add_named(eps.container(), "home"); + self.stack.add_named(eps.view.container(), "home"); // Keep the previous state. let s = self.state; // Set the visible child back to the previous one to avoid diff --git a/podcasts-gtk/src/widgets/home_view.rs b/podcasts-gtk/src/widgets/home_view.rs index 59878e9..b11bbea 100644 --- a/podcasts-gtk/src/widgets/home_view.rs +++ b/podcasts-gtk/src/widgets/home_view.rs @@ -34,7 +34,7 @@ enum ListSplit { #[derive(Debug, Clone)] pub(crate) struct HomeView { - view: BaseView, + pub(crate) view: BaseView, frame_parent: gtk::Box, today_box: gtk::Box, yday_box: gtk::Box, @@ -125,18 +125,10 @@ impl HomeView { }; lazy_load_full(episodes, func, callback); - view.container().show_all(); + view.view.container().show_all(); Ok(view) } - pub(crate) fn container(&self) -> >k::Box { - self.view.container() - } - - pub(crate) fn scrolled_window(&self) -> >k::ScrolledWindow { - self.view.scrolled_window() - } - /// Set scrolled window vertical adjustment. fn set_vadjustment(&self) -> Result<(), Error> { let guard = EPISODES_VIEW_VALIGNMENT @@ -147,7 +139,7 @@ impl HomeView { // Copy the vertical scrollbar adjustment from the old view into the new one. let res = fragile .try_get() - .map(|x| utils::smooth_scroll_to(self.scrolled_window(), &x)) + .map(|x| utils::smooth_scroll_to(self.view.scrolled_window(), &x)) .map_err(From::from); debug_assert!(res.is_ok()); @@ -161,6 +153,7 @@ impl HomeView { pub(crate) fn save_alignment(&self) -> Result<(), Error> { if let Ok(mut guard) = EPISODES_VIEW_VALIGNMENT.lock() { let adj = self + .view .scrolled_window() .get_vadjustment() .ok_or_else(|| format_err!("Could not get the adjustment"))?;