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

Update gtk-rs

Browse source 
This brings us a neat new function, `imp()`,
that lets us drop `from_instance()` everywhere.
This commit is contained in:
Christopher Davis 2021-12-29 14:02:48 -08:00
parent 400672b6b6
commit 56a47fb447
4 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/widgets/image.rs
View file

@ -173,13 +173,13 @@ glib::wrapper! {
impl LpImage {
pub fn file(&self) -> Option<gio::File> {
let imp = imp::LpImage::from_instance(self);
let imp = self.imp();
imp.file.borrow().clone()
}
pub fn set_file(&self, file: &gio::File) {
let imp = imp::LpImage::from_instance(self);
let imp = self.imp();
match gdk::Texture::from_file(file) {
Ok(texture) => {
@ -197,12 +197,12 @@ impl LpImage {
}
pub fn image_width(&self) -> i32 {
let imp = imp::LpImage::from_instance(&self);
let imp = self.imp();
imp.image_width.get()
}
pub fn image_height(&self) -> i32 {
let imp = imp::LpImage::from_instance(&self);
let imp = self.imp();
imp.image_height.get()
}
}

20
src/widgets/image_view.rs
View file

@ -146,7 +146,7 @@ glib::wrapper! {
impl LpImageView {
pub fn set_image_from_file(&self, file: &gio::File) -> anyhow::Result<(i32, i32)> {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
if let Some(current_file) = imp.picture.file() {
if current_file.path().as_deref() == file.path().as_deref() {
@ -170,7 +170,7 @@ impl LpImageView {
}
fn set_parent_from_file(&self, file: &gio::File) {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
if let Some(parent) = file.parent() {
let parent_path = parent.path().map(|p| p.to_str().unwrap().to_string());
@ -231,7 +231,7 @@ impl LpImageView {
}
fn update_image(&self) {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
let path = &format!(
"{}/{}",
@ -248,21 +248,21 @@ impl LpImageView {
}
pub fn next(&self) {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
// TODO: Replace with `Cell::update()` once stabilized
imp.index.set(imp.index.get() + 1);
self.update_image();
}
pub fn previous(&self) {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
// TODO: Replace with `Cell::update()` once stabilized
imp.index.set(imp.index.get() - 1);
self.update_image();
}
pub fn update_action_state(&self) {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
let index = imp.index.get();
self.action_set_enabled("iv.next", index < imp.directory_pictures.borrow().len() - 1);
self.action_set_enabled("iv.previous", index > 0);
@ -297,7 +297,7 @@ impl LpImageView {
}
pub fn print(&self) -> anyhow::Result<()> {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
let operation = gtk::PrintOperation::new();
let path = &format!(
@ -338,17 +338,17 @@ impl LpImageView {
}
pub fn uri(&self) -> Option<String> {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
imp.uri.borrow().to_owned()
}
pub fn filename(&self) -> Option<String> {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
imp.filename.borrow().to_owned()
}
pub fn show_popover_at(&self, x: f64, y: f64) {
let imp = imp::LpImageView::from_instance(&self);
let imp = self.imp();
let rect = gdk::Rectangle::new(x as i32, y as i32, 0, 0);