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

metadata: Merge memory_format correctly

Browse source
This commit is contained in:
Sophie Herold 2024-08-05 23:43:52 +02:00
parent 8ddaf34e87
commit 7e227097ef
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/metadata.rs
View file

@ -110,6 +110,9 @@ impl Metadata {
if self.frame_info.is_none() { if self.frame_info.is_none() {
self.frame_info = other.frame_info; self.frame_info = other.frame_info;
} }
if self.memory_format.is_none() {
self.memory_format = other.memory_format;
}
} }
pub fn mime_type(&self) -> Option<String> { pub fn mime_type(&self) -> Option<String> {

2
src/widgets/image/background_color.rs
View file

@ -58,6 +58,8 @@ impl imp::LpImage {
pub async fn background_color_guess(&self) -> Option<gdk::RGBA> { pub async fn background_color_guess(&self) -> Option<gdk::RGBA> {
let obj = self.obj(); let obj = self.obj();
log::debug!("Determining background color");
if self.fixed_background_color.borrow().is_some() { if self.fixed_background_color.borrow().is_some() {
return None; return None;
} }