lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop using .get() for template children

Browse source 
We can drop this completely now that Deref is implemented.
This commit is contained in:
Christopher Davis 2021-01-13 23:16:02 -08:00
parent f1fa94fca7
commit 28bf2b9213
3 changed files with 94 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/widgets/image_view.rs
View file

@ -129,20 +129,18 @@ mod imp {
fn constructed(&self, obj: &Self::Type) {
self.parent_constructed(obj);
obj.bind_property("header-visible", &self.headerbar.get(), "visible")
obj.bind_property("header-visible", &*self.headerbar, "visible")
.flags(glib::BindingFlags::BIDIRECTIONAL)
.flags(glib::BindingFlags::SYNC_CREATE)
.build()
.unwrap();
self.click_gesture
.get()
.connect_pressed(clone!(@weak obj => move |_, _, x, y| {
obj.show_popover_at(x, y);
}));
self.press_gesture
.get()
.connect_pressed(clone!(@weak obj => move |_, x, y| {
obj.show_popover_at(x, y);
}));
@ -171,12 +169,12 @@ mod imp {
}
subclass::Property("primary-menu-model", ..) => {
let model: Option<gio::MenuModel> = value.get().unwrap();
self.menu_button.get().set_menu_model(model.as_ref());
self.menu_button.set_menu_model(model.as_ref());
*self.menu_model.borrow_mut() = model;
}
subclass::Property("popover-menu-model", ..) => {
let model: Option<gio::MenuModel> = value.get().unwrap();
self.popover.get().set_menu_model(model.as_ref());
self.popover.set_menu_model(model.as_ref());
*self.popover_menu_model.borrow_mut() = model;
}
_ => unimplemented!(),
@ -197,7 +195,7 @@ mod imp {
impl WidgetImpl for IvImageView {
fn size_allocate(&self, widget: &Self::Type, width: i32, height: i32, baseline: i32) {
self.parent_size_allocate(widget, width, height, baseline);
self.popover.get().present();
self.popover.present();
}
}
}
@ -212,7 +210,7 @@ impl IvImageView {
pub fn set_image_from_file(&self, file: &gio::File) {
let imp = imp::IvImageView::from_instance(&self);
imp.picture.get().set_file(Some(file));
imp.picture.set_file(Some(file));
}
pub fn set_wallpaper(&self) -> anyhow::Result<()> {
@ -238,7 +236,7 @@ impl IvImageView {
pub fn print(&self) -> anyhow::Result<()> {
let imp = imp::IvImageView::from_instance(&self);
let file = imp.picture.get().get_file().context("No file to print")?;
let file = imp.picture.get_file().context("No file to print")?;
let operation = gtk::PrintOperation::new();
let path = file.get_path().context("No path for current file")?;
let pb = gdk_pixbuf::Pixbuf::from_file(path)?;
@ -273,13 +271,12 @@ impl IvImageView {
pub fn uri(&self) -> Option<String> {
let imp = imp::IvImageView::from_instance(&self);
let file = imp.picture.get().get_file()?;
let file = imp.picture.get_file()?;
Some(file.get_uri().to_string())
}
pub fn show_popover_at(&self, x: f64, y: f64) {
let imp = imp::IvImageView::from_instance(&self);
let popover = imp.popover.get();
let rect = gdk::Rectangle {
x: x as i32,
@ -288,7 +285,7 @@ impl IvImageView {
height: 0,
};
popover.set_pointing_to(&rect);
popover.popup();
imp.popover.set_pointing_to(&rect);
imp.popover.popup();
}
}

16
src/window.rs
View file

@ -99,7 +99,6 @@ mod imp {
obj.setup_actions();
self.status_page
.get() // .get() is needed for now to use template children.
.set_icon_name(Some(&format!("{}-symbolic", config::APP_ID)));
// Set help overlay
@ -112,16 +111,15 @@ mod imp {
// In this case, we need none to react to the gesture,
// so "_" is used in all 4 spots.
self.open_gesture
.get()
.connect_released(clone!(@weak obj => move |_, _, _, _| {
obj.pick_file();
}));
obj.bind_property("fullscreened", &self.image_view.get(), "header-visible")
obj.bind_property("fullscreened", &*self.image_view, "header-visible")
.flags(glib::BindingFlags::SYNC_CREATE | glib::BindingFlags::BIDIRECTIONAL)
.build()
.unwrap();
obj.bind_property("fullscreened", &self.headerbar.get(), "visible")
obj.bind_property("fullscreened", &*self.headerbar, "visible")
.flags(
glib::BindingFlags::SYNC_CREATE
| glib::BindingFlags::BIDIRECTIONAL
@ -228,7 +226,7 @@ impl IvWindow {
fn open_with(&self) {
let imp = imp::IvWindow::from_instance(self);
if let Some(uri) = imp.image_view.get().uri() {
if let Some(uri) = imp.image_view.uri() {
std::process::Command::new("xdg-open")
.arg(uri)
.output()
@ -241,7 +239,7 @@ impl IvWindow {
fn set_wallpaper(&self) {
let imp = imp::IvWindow::from_instance(self);
if let Err(e) = imp.image_view.get().set_wallpaper() {
if let Err(e) = imp.image_view.set_wallpaper() {
log::error!("Failed to set wallpaper: {}", e);
}
}
@ -249,7 +247,7 @@ impl IvWindow {
fn print(&self) {
let imp = imp::IvWindow::from_instance(self);
if let Err(e) = imp.image_view.get().print() {
if let Err(e) = imp.image_view.print() {
log::error!("Failed to print file: {}", e);
}
}
@ -257,8 +255,8 @@ impl IvWindow {
pub fn set_image_from_file(&self, file: &gio::File) {
let imp = imp::IvWindow::from_instance(self);
imp.image_view.get().set_image_from_file(file);
imp.stack.get().set_visible_child(&imp.image_view.get());
imp.image_view.set_image_from_file(file);
imp.stack.set_visible_child(&*imp.image_view);
log::debug!("Loading file: {}", file.get_uri().to_string());