mirror of
https://github.com/YGGverse/Yoda.git
synced 2025-01-15 09:10:08 +00:00
remove extra getters
This commit is contained in:
parent
3e3f74dff6
commit
1497896f6d
@ -42,7 +42,7 @@ impl Content {
|
||||
pub fn to_image(&self, paintable: &impl IsA<Paintable>) -> Image {
|
||||
self.clean();
|
||||
let image = Image::new_from_paintable(paintable);
|
||||
self.gobject.append(image.gobject());
|
||||
self.gobject.append(&image.picture);
|
||||
image
|
||||
}
|
||||
|
||||
@ -57,7 +57,7 @@ impl Content {
|
||||
) -> Status {
|
||||
self.clean();
|
||||
let status = Status::new_download(initial_filename, cancellable, on_choose);
|
||||
self.gobject.append(status.gobject());
|
||||
self.gobject.append(&status.gobject);
|
||||
status
|
||||
}
|
||||
|
||||
@ -67,7 +67,7 @@ impl Content {
|
||||
pub fn to_status_failure(&self) -> Status {
|
||||
self.clean();
|
||||
let status = Status::new_failure();
|
||||
self.gobject.append(status.gobject());
|
||||
self.gobject.append(&status.gobject);
|
||||
status
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ impl Content {
|
||||
pub fn to_status_mime(&self, mime: &str, download: Option<(Rc<TabAction>, GString)>) -> Status {
|
||||
self.clean();
|
||||
let status = Status::new_mime(mime, download);
|
||||
self.gobject.append(status.gobject());
|
||||
self.gobject.append(&status.gobject);
|
||||
status
|
||||
}
|
||||
|
||||
@ -87,7 +87,7 @@ impl Content {
|
||||
pub fn to_status_identity(&self) -> Status {
|
||||
self.clean();
|
||||
let status = Status::new_identity(self.tab_action.clone());
|
||||
self.gobject.append(status.gobject());
|
||||
self.gobject.append(&status.gobject);
|
||||
status
|
||||
}
|
||||
|
||||
@ -97,7 +97,7 @@ impl Content {
|
||||
pub fn to_status_loading(&self, show_with_delay: Option<Duration>) -> Status {
|
||||
self.clean();
|
||||
let status = Status::new_loading(show_with_delay);
|
||||
self.gobject.append(status.gobject());
|
||||
self.gobject.append(&status.gobject);
|
||||
status
|
||||
}
|
||||
|
||||
|
@ -5,7 +5,7 @@ use gtk::{
|
||||
};
|
||||
|
||||
pub struct Image {
|
||||
gobject: Picture,
|
||||
pub picture: Picture,
|
||||
}
|
||||
|
||||
impl Image {
|
||||
@ -17,18 +17,12 @@ impl Image {
|
||||
// Constructors
|
||||
|
||||
pub fn new_from_paintable(paintable: &impl IsA<Paintable>) -> Self {
|
||||
let gobject = Picture::for_paintable(paintable);
|
||||
let picture = Picture::for_paintable(paintable);
|
||||
|
||||
gobject.set_content_fit(Self::DEFAULT_CONTENT_FIT);
|
||||
gobject.set_margin_end(Self::DEFAULT_MARGIN);
|
||||
gobject.set_margin_start(Self::DEFAULT_MARGIN);
|
||||
picture.set_content_fit(Self::DEFAULT_CONTENT_FIT);
|
||||
picture.set_margin_end(Self::DEFAULT_MARGIN);
|
||||
picture.set_margin_start(Self::DEFAULT_MARGIN);
|
||||
|
||||
Self { gobject }
|
||||
}
|
||||
|
||||
// Getters
|
||||
|
||||
pub fn gobject(&self) -> &Picture {
|
||||
&self.gobject
|
||||
Self { picture }
|
||||
}
|
||||
}
|
||||
|
@ -86,10 +86,4 @@ impl Status {
|
||||
self.gobject.set_description(value);
|
||||
self
|
||||
}
|
||||
|
||||
// Getters
|
||||
|
||||
pub fn gobject(&self) -> &StatusPage {
|
||||
&self.gobject
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user