toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ShowStack: Copy the scrollbar position only if both widget represent the same podcast.

Browse Source
This commit is contained in:
Jordan Petridis 2018-01-06 05:38:31 +02:00
parent e961d5f8b0
commit 4a6a9517f1
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hammond-gtk/src/content.rs
View File

@ -161,6 +161,15 @@ impl ShowStack {
.unwrap(); .unwrap();
debug!("Name: {:?}", WidgetExt::get_name(&old)); debug!("Name: {:?}", WidgetExt::get_name(&old));
let new = ShowWidget::new(Arc::new(self.clone()), pd, self.sender.clone());
// Each composite ShowWidget is a gtkBox with the Podcast.id encoded in the gtk::Widget
// name. It's a hack since we can't yet subclass GObject easily.
let oldid = WidgetExt::get_name(&old);
let newid = WidgetExt::get_name(&new.container);
debug!("Old widget Name: {:?}\nNew widget Name: {:?}", oldid, newid);
// Only copy the old scrollbar if both widget's represent the same podcast.
if newid == oldid {
let scrolled_window = old.get_children() let scrolled_window = old.get_children()
.first() .first()
// This is guaranted to exist based on the show_widget.ui file. // This is guaranted to exist based on the show_widget.ui file.
@ -171,11 +180,11 @@ impl ShowStack {
.unwrap(); .unwrap();
debug!("Name: {:?}", WidgetExt::get_name(&scrolled_window)); debug!("Name: {:?}", WidgetExt::get_name(&scrolled_window));
let new = ShowWidget::new(Arc::new(self.clone()), pd, self.sender.clone());
// Copy the vertical scrollbar adjustment from the old view into the new one. // Copy the vertical scrollbar adjustment from the old view into the new one.
scrolled_window scrolled_window
.get_vadjustment() .get_vadjustment()
.map(|x| new.set_vadjustment(&x)); .map(|x| new.set_vadjustment(&x));
}
self.stack.remove(&old); self.stack.remove(&old);
self.stack.add_named(&new.container, "widget"); self.stack.add_named(&new.container, "widget");