Fix arbitrary scaling

Author: NickeZ

src/rust/bitbox02-sys/wrapper.h

@@ -50,7 +50,6 @@
 #include <ui/screen_stack.h>
 #include <ui/ugui/ugui.h>
 #include <util.h>
-#include <workflow/orientation_screen.h>
 
 #if defined(TESTING)
 #include <fake_memory.h>
@@ -60,6 +59,7 @@
 #include <ui/event_handler.h>
 #include <usb/usb_packet.h>
 #include <usb/usb_processing.h>
+#include <workflow/orientation_screen.h>
 #endif
 
 #if !defined(TESTING)

test/simulator-ng/src/main.rs

@@ -287,13 +287,13 @@ impl App {
         let bg_id = canvas
             .create_image(
                 ImageSource::try_from(&bg_orig).unwrap(),
-                ImageFlags::empty(),
+                ImageFlags::NEAREST,
             )
             .unwrap();
         let screen_id = canvas
             .create_image(
                 ImageSource::try_from(&*SCREEN_FB.lock().unwrap()).unwrap(),
-                ImageFlags::empty(),
+                ImageFlags::NEAREST,
             )
             .unwrap();
 
@@ -337,12 +337,12 @@ impl ApplicationHandler<UserEvent> for App {
                     let window_size = window.inner_size();
                     canvas.set_size(window_size.width, window_size.height, dpi_factor);
 
+                    let margin = (MARGIN as f32 * dpi_factor) as u32;
+
                     let bitbox_x = MARGIN as f32 * dpi_factor;
                     let bitbox_y = MARGIN as f32 * dpi_factor;
-                    let bitbox_width =
-                        (SCREEN_WIDTH + PADDING_LEFT + PADDING_RIGHT) as f32 * dpi_factor;
-                    let bitbox_height =
-                        (SCREEN_HEIGHT + 2 * PADDING_TOP_BOTTOM) as f32 * dpi_factor;
+                    let bitbox_width = (window_size.width - 2 * margin) as f32;
+                    let bitbox_height = (window_size.height - 2 * margin) as f32;
 
                     let mut bitbox_path = Path::new();
                     bitbox_path.rect(bitbox_x, bitbox_y, bitbox_width, bitbox_height);
@@ -359,11 +359,19 @@ impl ApplicationHandler<UserEvent> for App {
                             1f32,
                         ),
                     );
-
-                    let screen_x = (MARGIN + PADDING_LEFT) as f32 * dpi_factor;
-                    let screen_y = (MARGIN + PADDING_TOP_BOTTOM) as f32 * dpi_factor;
-                    let screen_width = SCREEN_WIDTH as f32 * dpi_factor;
-                    let screen_height = SCREEN_HEIGHT as f32 * dpi_factor;
+                    let bitbox_width_scale_factor = (window_size.width - 2 * margin) as f32
+                        / (PADDING_LEFT + SCREEN_WIDTH + PADDING_RIGHT) as f32;
+
+                    let bitbox_height_scale_factor = (window_size.height - 2 * margin) as f32
+                        / (2 * PADDING_TOP_BOTTOM + SCREEN_HEIGHT) as f32;
+
+                    let screen_x =
+                        (margin as f32 + PADDING_LEFT as f32 * bitbox_width_scale_factor) as f32;
+                    let screen_y = (margin as f32
+                        + PADDING_TOP_BOTTOM as f32 * bitbox_height_scale_factor)
+                        as f32;
+                    let screen_width = SCREEN_WIDTH as f32 * bitbox_width_scale_factor;
+                    let screen_height = SCREEN_HEIGHT as f32 * bitbox_height_scale_factor;
                     let mut screen_path = Path::new();
                     screen_path.rect(screen_x, screen_y, screen_width, screen_height);
                     canvas.fill_path(
@@ -395,11 +403,25 @@ impl ApplicationHandler<UserEvent> for App {
                 }
             }
             WindowEvent::CursorMoved { position, .. } => {
-                debug!("{position:?}");
+                //debug!("{position:?}");
                 let Some(window) = &mut self.window else {
                     return;
                 };
-                let (x, y): (i32, i32) = position.to_logical::<f64>(window.scale_factor()).into();
+                //let (x, y): (i32, i32) = position.to_logical::<f64>(window.scale_factor()).into();
+                let (x, y) = (position.x, position.y);
+                let window_size = window.inner_size();
+                let dpi_factor = window.scale_factor() as f32;
+                //let margin = (MARGIN as f32 * dpi_factor) as u32;
+                let width_scale_factor = (window_size.width) as f32
+                    / (2 * MARGIN + PADDING_LEFT + SCREEN_WIDTH + PADDING_RIGHT) as f32;
+
+                let height_scale_factor = (window_size.height) as f32
+                    / (2 * MARGIN + 2 * PADDING_TOP_BOTTOM + SCREEN_HEIGHT) as f32;
+
+                let (x, y) = (
+                    (x as f32 / width_scale_factor) as i32,
+                    (y as f32 / height_scale_factor) as i32,
+                );
                 let xrel = x - self.mouse_last_x;
                 let yrel = y - self.mouse_last_y;
                 // Ignore if mouse didn't move long enough