YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-01-15 17:20:08 +00:00
Code Issues Projects Releases Wiki Activity

replace deprecated Picture::for_pixbuf method with Picture::for_paintable

Browse Source
This commit is contained in:
yggverse 2024-11-22 14:45:39 +02:00
parent 6ca1b3ce9a
commit c5ca74702a
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/browser/window/tab/item/page.rs
View File

@ -19,6 +19,7 @@ use crate::app::browser::{
}; };
use crate::Profile; use crate::Profile;
use gtk::{ use gtk::{
gdk::Texture,
gdk_pixbuf::Pixbuf, gdk_pixbuf::Pixbuf,
gio::{ gio::{
Cancellable, IOStream, NetworkAddress, SocketClient, SocketClientEvent, SocketConnectable, Cancellable, IOStream, NetworkAddress, SocketClient, SocketClientEvent, SocketConnectable,
@ -673,7 +674,7 @@ impl Page {
.set_title(uri_to_title(&uri).as_str()); .set_title(uri_to_title(&uri).as_str());
// Update page content // Update page content
content.to_image(&buffer); content.to_image(&Texture::for_pixbuf(&buffer));
// Update window components // Update window components
update.activate(Some(&id)); update.activate(Some(&id));

8
src/app/browser/window/tab/item/page/content.rs
View File

@ -8,9 +8,9 @@ use text::Text;
use crate::app::browser::window::{tab::item::Action as TabAction, Action as WindowAction}; use crate::app::browser::window::{tab::item::Action as TabAction, Action as WindowAction};
use gtk::{ use gtk::{
gdk_pixbuf::Pixbuf, gdk::Paintable,
glib::Uri, glib::Uri,
prelude::{BoxExt, WidgetExt}, prelude::{BoxExt, IsA, WidgetExt},
Box, Orientation, Box, Orientation,
}; };
use std::{rc::Rc, time::Duration}; use std::{rc::Rc, time::Duration};
@ -38,9 +38,9 @@ impl Content {
/// Set new `content::Image` component for `Self` /// Set new `content::Image` component for `Self`
/// ///
/// * action removes previous children component from `Self` /// * action removes previous children component from `Self`
pub fn to_image(&self, buffer: &Pixbuf) -> Image { pub fn to_image(&self, paintable: &impl IsA<Paintable>) -> Image {
self.clean(); self.clean();
let image = Image::new_from_pixbuf(buffer); let image = Image::new_from_paintable(paintable);
self.gobject.append(image.gobject()); self.gobject.append(image.gobject());
image image
} }

10
src/app/browser/window/tab/item/page/content/image.rs
View File

@ -1,4 +1,8 @@
use gtk::{gdk_pixbuf::Pixbuf, prelude::WidgetExt, ContentFit, Picture}; use gtk::{
gdk::Paintable,
prelude::{IsA, WidgetExt},
ContentFit, Picture,
};
pub struct Image { pub struct Image {
gobject: Picture, gobject: Picture,
@ -12,8 +16,8 @@ impl Image {
// Constructors // Constructors
pub fn new_from_pixbuf(buffer: &Pixbuf) -> Self { pub fn new_from_paintable(paintable: &impl IsA<Paintable>) -> Self {
let gobject = Picture::for_pixbuf(buffer); let gobject = Picture::for_paintable(paintable);
gobject.set_content_fit(Self::DEFAULT_CONTENT_FIT); gobject.set_content_fit(Self::DEFAULT_CONTENT_FIT);
gobject.set_margin_end(Self::DEFAULT_MARGIN); gobject.set_margin_end(Self::DEFAULT_MARGIN);