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

cargo: Update gtk-rs stack

Browse source
This commit is contained in:
Sophie Herold 2024-02-05 16:27:05 +01:00
parent a7116925bf
commit 0ed7036098
11 changed files with 230 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/widgets/image/rendering.rs
View file

@ -299,13 +299,10 @@ impl imp::LpImage {
let obj = self.obj();
// TODO: This avoids panics and should be fixed upstream
if obj.is_realized() {
obj.native()
.map(|x| x.surface().scale())
.unwrap_or_else(|| obj.scale_factor() as f64)
} else {
1.
}
obj.native()
.and_then(|x| x.surface())
.map(|x| x.scale())
.unwrap_or_else(|| obj.scale_factor() as f64)
}
/// Monitor size in physical pixels
@ -313,8 +310,8 @@ impl imp::LpImage {
let obj = self.obj();
if let Some(display) = gdk::Display::default() {
if let Some(native) = obj.native() {
if let Some(monitor) = display.monitor_at_surface(&native.surface()) {
if let Some(surface) = obj.native().and_then(|x| x.surface()) {
if let Some(monitor) = display.monitor_at_surface(&surface) {
let hidpi_scale = self.scaling();
let monitor_geometry = monitor.geometry();
let monitor_size = (