Fixed bit depth

mbwilding · Jan 29, 2024 · c345c3c · c345c3c
1 parent 61f1a0b
commit c345c3c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/csharp/screen.rs b/src/csharp/screen.rs
@@ -55,7 +55,7 @@ impl Screen {
 
             unsafe { GetMonitorInfoW(HMONITOR(monitor), ptr::addr_of!(info) as *mut MONITORINFO) };
 
-            device_name.push_str(&String::from_utf16_lossy(&info.szDevice));
+            device_name.push_str(String::from_utf16_lossy(&info.szDevice).trim_end_matches('\0'));
             bounds = Rectangle::from(info.monitorInfo.rcMonitor);
             primary = (info.monitorInfo.dwFlags & MONITORINFOF_PRIMARY) != 0;
 
@@ -71,9 +71,9 @@ impl Screen {
             }
         }
 
-        if let Some(hdc) = hdc {
-            bit_depth = unsafe { GetDeviceCaps(hdc, BITSPIXEL) };
-            bit_depth *= unsafe { GetDeviceCaps(hdc, PLANES) };
+        if let Some(screen_dc) = screen_dc {
+            bit_depth = unsafe { GetDeviceCaps(screen_dc, BITSPIXEL) };
+            bit_depth *= unsafe { GetDeviceCaps(screen_dc, PLANES) };
         }
 
         if hdc != screen_dc {

diff --git a/src/main.rs b/src/main.rs
@@ -16,6 +16,7 @@ mod windows_manager;
 mod windows_window;
 mod workspace;
 
+use crate::csharp::screen::Screen;
 use crate::layout_engines::LayoutEngine;
 use eframe::egui;
 use log::{debug, info};
@@ -27,6 +28,8 @@ fn main() -> eframe::Result<()> {
     info!("Starting Tile-RS");
     single::check();
 
+    println!("{:#?}", Screen::all_screens());
+
     let native_options = eframe::NativeOptions {
         viewport: egui::ViewportBuilder::default()
             .with_inner_size([1280.0, 720.0])