From 287620d6cd23e48cdb0742a6cb6fd9dce2319f2d Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 28 Dec 2017 19:16:51 +0200 Subject: [PATCH] hammond-gtk: Added some getters and removed some public fields. --- hammond-gtk/src/content.rs | 14 +++++++++++--- hammond-gtk/src/headerbar.rs | 7 ++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hammond-gtk/src/content.rs b/hammond-gtk/src/content.rs index 7722ae0..630e7e2 100644 --- a/hammond-gtk/src/content.rs +++ b/hammond-gtk/src/content.rs @@ -15,8 +15,8 @@ use std::rc::Rc; #[derive(Debug, Clone)] pub struct Content { - pub stack: gtk::Stack, - pub shows: Rc, + stack: gtk::Stack, + shows: Rc, episodes: Rc, } @@ -44,11 +44,15 @@ impl Content { pub fn get_stack(&self) -> gtk::Stack { self.stack.clone() } + + pub fn get_shows(&self) -> Rc { + self.shows.clone() + } } #[derive(Debug, Clone)] pub struct ShowStack { - pub stack: gtk::Stack, + stack: gtk::Stack, header: Rc
, epstack: Rc, } @@ -149,6 +153,10 @@ impl ShowStack { self.stack .set_visible_child_full("widget", gtk::StackTransitionType::SlideLeft) } + + pub fn get_stack(&self) -> gtk::Stack { + self.stack.clone() + } } #[derive(Debug, Clone)] diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 96a3ecc..f811324 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -30,9 +30,6 @@ impl Default for Header { let back_button: gtk::Button = builder.get_object("back_button").unwrap(); let show_title: gtk::Label = builder.get_object("show_title").unwrap(); - switch.set_halign(gtk::Align::Center); - switch.show(); - Header { container: header, add_toggle, @@ -60,7 +57,7 @@ impl Header { let new_url: gtk::Entry = builder.get_object("new_url").unwrap(); let add_button: gtk::Button = builder.get_object("add_button").unwrap(); let refresh_button: gtk::Button = builder.get_object("refresh_button").unwrap(); - self.switch.set_stack(&content.stack); + self.switch.set_stack(&content.get_stack()); new_url.connect_changed(move |url| { println!("{:?}", url.get_text()); @@ -90,7 +87,7 @@ impl Header { add_toggle.show(); back.hide(); show_title.hide(); - content.shows.stack.set_visible_child_full("podcasts", gtk::StackTransitionType::SlideRight); + content.get_shows().get_stack().set_visible_child_full("podcasts", gtk::StackTransitionType::SlideRight); }), ); }