mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-03 22:58:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: scroll build window only if close to bottom

Browse source
This commit is contained in:
Gabriele Musco 2023-07-03 20:35:00 +02:00
commit 512a0d6414
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ui/build_window.rs
View file

@ -23,6 +23,8 @@ pub struct BuildWindow {
pub win: Option<adw::Window>, pub win: Option<adw::Window>,
#[tracker::do_not_track] #[tracker::do_not_track]
build_status_label: Option<gtk::Label>, build_status_label: Option<gtk::Label>,
#[tracker::do_not_track]
scrolledwin: Option<gtk::ScrolledWindow>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -87,6 +89,7 @@ impl SimpleComponent for BuildWindow {
set_justify: gtk::Justification::Center, set_justify: gtk::Justification::Center,
} }
}, },
#[name(scrolledwin)]
gtk::ScrolledWindow { gtk::ScrolledWindow {
set_hexpand: true, set_hexpand: true,
set_vexpand: true, set_vexpand: true,
@ -135,6 +138,11 @@ impl SimpleComponent for BuildWindow {
} }
Self::Input::UpdateContent(c) => { Self::Input::UpdateContent(c) => {
if c.len() > 0 { if c.len() > 0 {
let is_at_bottom = {
let adj = self.scrolledwin.as_ref().unwrap().vadjustment();
(adj.upper() - adj.page_size() - adj.value()) <= 15.0
};
let n_lines = c.concat(); let n_lines = c.concat();
let mut n_content = self.content.clone(); let mut n_content = self.content.clone();
n_content.push_str(n_lines.as_str()); n_content.push_str(n_lines.as_str());
@ -145,10 +153,12 @@ impl SimpleComponent for BuildWindow {
); );
let textbuf = self.textbuf.clone(); let textbuf = self.textbuf.clone();
let textview = self.textview.as_ref().unwrap().clone(); let textview = self.textview.as_ref().unwrap().clone();
gtk::glib::idle_add_local_once(move || { if is_at_bottom {
let end_mark = textbuf.create_mark(None, &textbuf.end_iter(), false); gtk::glib::idle_add_local_once(move || {
textview.scroll_mark_onscreen(&end_mark); let end_mark = textbuf.create_mark(None, &textbuf.end_iter(), false);
}); textview.scroll_mark_onscreen(&end_mark);
});
}
} }
} }
Self::Input::UpdateBuildStatus(status) => { Self::Input::UpdateBuildStatus(status) => {
@ -182,12 +192,14 @@ impl SimpleComponent for BuildWindow {
textview: None, textview: None,
build_status: BuildStatus::Building, build_status: BuildStatus::Building,
win: None, win: None,
scrolledwin: None,
build_status_label: None, build_status_label: None,
}; };
let widgets = view_output!(); let widgets = view_output!();
model.win = Some(widgets.win.clone()); model.win = Some(widgets.win.clone());
model.build_status_label = Some(widgets.build_status_label.clone()); model.build_status_label = Some(widgets.build_status_label.clone());
model.textview = Some(widgets.textview.clone()); model.textview = Some(widgets.textview.clone());
model.scrolledwin = Some(widgets.scrolledwin.clone());
ComponentParts { model, widgets } ComponentParts { model, widgets }
} }
} }