Fixed missing stuffs with image formats

This commit is contained in:
Piyush मिश्रः 2022-03-05 19:57:26 +05:30
parent 3d9b20bbc8
commit a21f638432
2 changed files with 18 additions and 3 deletions

View File

@ -504,6 +504,19 @@ impl ConfigWindow {
utils::set_color_btn_rgba(config.color_layer, &mut self.translucent_layer_rgb); utils::set_color_btn_rgba(config.color_layer, &mut self.translucent_layer_rgb);
self.translucent_layer_alpha self.translucent_layer_alpha
.set_value(config.color_layer[3] as f64); .set_value(config.color_layer[3] as f64);
match config.image_format.as_str() {
"png" => {
self.png_format.set_value(true);
self.jpeg_format.set_value(false)
}
"jpg" => {
self.png_format.set_value(false);
self.jpeg_format.set_value(true)
}
_ => (),
}
*self.did_save.borrow_mut() = false; *self.did_save.borrow_mut() = false;
drop(config); drop(config);
self.win.show(); self.win.show();
@ -1062,7 +1075,7 @@ impl ConfigWindow {
.borrow_mut() .borrow_mut()
.get_mut(&browse.selected_text().unwrap()) .get_mut(&browse.selected_text().unwrap())
{ {
conf.image_format = "jpeg".to_owned(); conf.image_format = "jpg".to_owned();
} }
}); });

View File

@ -263,7 +263,7 @@ impl ImageContainer {
warn!("Failed to export Image!\n{:?}", e); warn!("Failed to export Image!\n{:?}", e);
} }
} }
"jpeg" => { "jpg" => {
let mut encoder = let mut encoder =
image::codecs::jpeg::JpegEncoder::new_with_quality(&mut output, 100); image::codecs::jpeg::JpegEncoder::new_with_quality(&mut output, 100);
encoder.set_pixel_density(image::codecs::jpeg::PixelDensity::dpi(300)); encoder.set_pixel_density(image::codecs::jpeg::PixelDensity::dpi(300));
@ -317,6 +317,8 @@ impl ImageContainer {
pub(crate) fn delete(&self) { pub(crate) fn delete(&self) {
let prop = self.properties.read().unwrap(); let prop = self.properties.read().unwrap();
let config = globals::CONFIG.read().unwrap();
let export_format = config.image_format.as_str();
let path_original = match &prop.path { let path_original = match &prop.path {
Some(p) => Path::new(p), Some(p) => Path::new(p),
@ -325,7 +327,7 @@ impl ImageContainer {
let path_properties = path_original.with_extension("prop"); let path_properties = path_original.with_extension("prop");
let export = path_original.parent().unwrap().join("export").join( let export = path_original.parent().unwrap().join("export").join(
path_original path_original
.with_extension("jpg") .with_extension(export_format)
.file_name() .file_name()
.unwrap() .unwrap()
.to_str() .to_str()