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

ShowWidget: Put the whole thing inside HdyColumn

Browse Source
This commit is contained in:
Jordan Petridis 2018-08-09 02:34:45 +03:00
parent 856af29a76
commit 5d8b2ec15c
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 57 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
podcasts-gtk/resources/gtk/show_widget.ui
View File

@ -30,24 +30,6 @@ Tobias Bernard
<!-- interface-description A podcast client for the GNOME Desktop --> <!-- interface-description A podcast client for the GNOME Desktop -->
<!-- interface-copyright 2017 - 2018 --> <!-- interface-copyright 2017 - 2018 -->
<!-- interface-authors Jordan Petridis\nTobias Bernard --> <!-- interface-authors Jordan Petridis\nTobias Bernard -->
<object class="GtkBox" id="container">
<property name="width_request">290</property>
<property name="height_request">420</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolled_window">
<property name="name">scrolled_window</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">never</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="sub_container"> <object class="GtkBox" id="sub_container">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -121,15 +103,4 @@ Sorry, we could not find a description for this Show.</property>
<placeholder/> <placeholder/>
</child> </child>
</object> </object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</interface> </interface>

21
podcasts-gtk/src/widgets/show.rs
View File

@ -1,5 +1,5 @@
use glib; use glib;
use gtk::{self, prelude::*, SelectionMode}; use gtk::{self, prelude::*, Orientation, SelectionMode};
use crossbeam_channel::Sender; use crossbeam_channel::Sender;
use failure::Error; use failure::Error;
@ -35,10 +35,15 @@ pub(crate) struct ShowWidget {
impl Default for ShowWidget { impl Default for ShowWidget {
fn default() -> Self { fn default() -> Self {
let container = gtk::Box::new(Orientation::Horizontal, 0);
let scrolled_window = gtk::ScrolledWindow::new(None, None);
container.add(&scrolled_window);
let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/show_widget.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/show_widget.ui");
let container: gtk::Box = builder.get_object("container").unwrap();
let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap();
let sub_cont: gtk::Box = builder.get_object("sub_container").unwrap(); let sub_cont: gtk::Box = builder.get_object("sub_container").unwrap();
let cover: gtk::Image = builder.get_object("cover").unwrap();
let description: gtk::Label = builder.get_object("description").unwrap();
let frame = gtk::Frame::new(None); let frame = gtk::Frame::new(None);
let episodes = gtk::ListBox::new(); let episodes = gtk::ListBox::new();
episodes.set_selection_mode(SelectionMode::None); episodes.set_selection_mode(SelectionMode::None);
@ -51,13 +56,11 @@ impl Default for ShowWidget {
let column = column.downcast::<gtk::Container>().unwrap(); let column = column.downcast::<gtk::Container>().unwrap();
frame.add(&episodes); frame.add(&episodes);
column.add(&frame); sub_cont.add(&frame);
sub_cont.add(&column); column.add(&sub_cont);
sub_cont.show_all(); scrolled_window.add(&column);
let cover: gtk::Image = builder.get_object("cover").unwrap();
let description: gtk::Label = builder.get_object("description").unwrap();
container.show_all();
ShowWidget { ShowWidget {
container, container,
scrolled_window, scrolled_window,