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

image/rendering: Use scale instead of scale-factor

Browse source 
`GdkSurface:scale` supports fractional scaling available as
"scale-monitor-framebuffer" on Mutter. Use this value everywhere
instead of the integer scale-factor

Closing #182
This commit is contained in:
Sophie Herold 2023-12-06 22:44:18 +01:00
parent 2ef5032627
commit 057ca6a3d0
7 changed files with 119 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/decoder/tiling.rs
View file

@ -99,7 +99,7 @@ impl Tile {
options: &RenderOptions,
) {
// Multiply by scale factor to get the image scaled to `zoom` in physical pixels
let zoom = output_zoom as f32 * options.scale_factor as f32 / self.zoom();
let zoom = output_zoom as f32 * options.scaling as f32 / self.zoom();
let area = round(&self.area().scale(zoom, zoom));
let area_with_bleed = round(&self.area_with_bleed().scale(zoom, zoom));
@ -214,7 +214,7 @@ pub struct TileLayer {
#[derive(Debug, Clone)]
pub struct RenderOptions {
pub scaling_filter: gsk::ScalingFilter,
pub scale_factor: i32,
pub scaling: f64,
pub background_color: Option<gdk::RGBA>,
}
@ -231,16 +231,13 @@ impl TiledImage {
log::trace!("Rendering {} tiles", tiles.len());
// Scale from application pixels back to physical pixels
snapshot.scale(
1. / options.scale_factor as f32,
1. / options.scale_factor as f32,
);
snapshot.scale(1. / options.scaling as f32, 1. / options.scaling as f32);
// reverse to put least fitting tiles in the background
for (_, tile) in tiles.iter().rev() {
tile.add_to_snapshot(snapshot, zoom, options);
}
// reset scale
snapshot.scale(options.scale_factor as f32, options.scale_factor as f32);
snapshot.scale(options.scaling as f32, options.scaling as f32);
}
pub fn push(&mut self, tile: Tile) {