Skip to content

Secondary Screens Do not Correctly Locate on Windows #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ATATC merged 2 commits into from
Dec 13, 2024
Merged

Secondary Screens Do not Correctly Locate on Windows #459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ff5bf7
Bug fixed. (#458)
ATATC Dec 12, 2024
c43ba76
Code reformatted. (#458)
ATATC Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 12 additions & 22 deletions leads_gui/prototype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
initialize_main as _initialize_main
from leads.comm import Server as _Server
from leads_gui.performance_checker import PerformanceChecker
from leads_gui.system import _ASSETS_PATH
from leads_gui.system import _ASSETS_PATH, get_system_kernel as _get_system_kernel
from leads_gui.types import Widget as _Widget, Color as _Color, Font as _Font


Expand Down Expand Up @@ -250,15 +250,8 @@ def __new__(cls, *args, **kwargs) -> _RuntimeData:


class Window(object):
def __init__(self,
master: _Misc | None = None,
width: int = 720,
height: int = 480,
title: str = "LEADS",
fullscreen: bool = False,
no_title_bar: bool = True,
display: int = 0,
popup: bool = False) -> None:
def __init__(self, master: _Misc | None = None, width: int = 720, height: int = 480, title: str = "LEADS",
fullscreen: bool = False, no_title_bar: bool = True, display: int = 0, popup: bool = False) -> None:
self._pot_master: _Misc | None = master
if master:
self._master: _CTk | _CTkToplevel = _CTkToplevel(master)
Expand Down Expand Up @@ -309,8 +302,11 @@ def show(self) -> None:
y = int((self._pot_master.winfo_height() - self._height) * .5 + self._pot_master.winfo_rooty())
self._master.transient(self._pot_master)
elif self._pot_master:
y += self._pot_master.winfo_screenheight() - self._screen_height - self._screen_y
self._master.geometry(f"{self._width}x{self._height}+{x}+{y}")
print(self._pot_master.winfo_screenheight(), self._screen_height, self._screen_y)
y += self._screen_y if _get_system_kernel() == "windows" else (self._pot_master.winfo_screenheight() -
self._screen_height - self._screen_y)
self._master.geometry(f"{self._width}x{self._height}{"-" if x < 0 else "+"}{abs(x)}{"-" if y < 0 else "+"}{abs(
y)}")
self._master.resizable(False, False)

def kill(self) -> None:
Expand All @@ -321,16 +317,9 @@ def kill(self) -> None:


class Pot(Window, _Generic[T]):
def __init__(self,
width: int,
height: int,
refresh_rate: int,
runtime_data: T,
on_refresh: _Callable[[_Self], None] = lambda _: None,
title: str = "LEADS",
fullscreen: bool = False,
no_title_bar: bool = True,
theme_mode: _Literal["system", "light", "dark"] = "system",
def __init__(self, width: int, height: int, refresh_rate: int, runtime_data: T,
on_refresh: _Callable[[_Self], None] = lambda _: None, title: str = "LEADS", fullscreen: bool = False,
no_title_bar: bool = True, theme_mode: _Literal["system", "light", "dark"] = "system",
display: int = 0) -> None:
Window.__init__(self, None, width, height, title, fullscreen, no_title_bar, display)
self._refresh_rate: int = refresh_rate
Expand Down Expand Up @@ -382,6 +371,7 @@ def active(self) -> bool:
@_override
def show(self) -> None:
super().show()

def wrapper(init: bool) -> None:
if not init:
self._on_refresh(self)
Expand Down