Creepso/stremio-shell-ng
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-shell-ng.git synced 2026-05-13 10:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #11 from Stremio/fix-full-screen

Browse source 
fix: Retrieve active monitor before going full screen
This commit is contained in:
Владимир Борисов 2025-01-16 09:23:35 +02:00 committed by GitHub
commit c58cbafa69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 156 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/stremio_app/window_helper.rs
View file

@ -1,9 +1,10 @@
use std::{cmp, mem}; use std::{cmp, mem};
use winapi::shared::windef::HWND; use winapi::shared::windef::HWND;
use winapi::um::winuser::{ use winapi::um::winuser::{
GetForegroundWindow, GetSystemMetrics, GetWindowLongA, GetWindowRect, IsIconic, IsZoomed, GetForegroundWindow, GetMonitorInfoA, GetSystemMetrics, GetWindowLongA, GetWindowRect,
SetForegroundWindow, SetWindowLongA, SetWindowPos, GWL_EXSTYLE, GWL_STYLE, HWND_NOTOPMOST, IsIconic, IsZoomed, MonitorFromWindow, SetForegroundWindow, SetWindowLongA, SetWindowPos,
HWND_TOPMOST, SM_CXSCREEN, SM_CYSCREEN, SWP_FRAMECHANGED, SWP_NOMOVE, SWP_NOSIZE, WS_CAPTION, GWL_EXSTYLE, GWL_STYLE, HWND_NOTOPMOST, HWND_TOPMOST, MONITORINFO, MONITOR_DEFAULTTONEAREST,
SM_CXSCREEN, SM_CYSCREEN, SWP_FRAMECHANGED, SWP_NOMOVE, SWP_NOSIZE, WS_CAPTION,
WS_EX_CLIENTEDGE, WS_EX_DLGMODALFRAME, WS_EX_STATICEDGE, WS_EX_TOPMOST, WS_EX_WINDOWEDGE, WS_EX_CLIENTEDGE, WS_EX_DLGMODALFRAME, WS_EX_STATICEDGE, WS_EX_TOPMOST, WS_EX_WINDOWEDGE,
WS_THICKFRAME, WS_THICKFRAME,
}; };
@ -91,6 +92,14 @@ impl WindowStyle {
self.size = ((rect.right - rect.left), (rect.bottom - rect.top)); self.size = ((rect.right - rect.left), (rect.bottom - rect.top));
self.style = GetWindowLongA(hwnd, GWL_STYLE); self.style = GetWindowLongA(hwnd, GWL_STYLE);
self.ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); self.ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE);
let monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
let mut monitor_info: MONITORINFO = mem::zeroed();
monitor_info.cbSize = mem::size_of_val(&monitor_info) as u32;
if GetMonitorInfoA(monitor, &mut monitor_info) == 0 {
println!("GetMonitorInfoA failed");
return;
}
SetWindowLongA( SetWindowLongA(
hwnd, hwnd,
GWL_STYLE, GWL_STYLE,
@ -108,10 +117,10 @@ impl WindowStyle {
SetWindowPos( SetWindowPos(
hwnd, hwnd,
HWND_NOTOPMOST, HWND_NOTOPMOST,
0, monitor_info.rcMonitor.left,
0, monitor_info.rcMonitor.top,
GetSystemMetrics(SM_CXSCREEN), monitor_info.rcMonitor.right - monitor_info.rcMonitor.left,
GetSystemMetrics(SM_CYSCREEN), monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top,
SWP_FRAMECHANGED, SWP_FRAMECHANGED,
); );
} }