Window type hint clean up. (#2366)

* use `@property` instead of attribute

* remove duplication of Window stubs

* update window stub

* Fix _window.pyi
use `@property` for `id` and `display_index`
`Tuple[int]` -> `Tuple[int, int]`
run black

Author: yunline

buildconfig/stubs/pygame/_sdl2/video.pyi

@@ -38,42 +38,7 @@ def messagebox(
     escape_button: int = 0,
 ) -> int: ...
 
-@final
-class Window:
-    DEFAULT_SIZE: Tuple[Literal[640], Literal[480]]
-    def __init__(
-        self,
-        title: str = "pygame window",
-        size: Iterable[int] = (640, 480),
-        position: Optional[Iterable[int]] = None,
-        fullscreen: bool = False,
-        fullscreen_desktop: bool = False,
-        **kwargs: bool
-    ) -> None: ...
-    @classmethod
-    def from_display_module(cls) -> Window: ...
-    grab: bool
-    relative_mouse: bool
-    def set_windowed(self) -> None: ...
-    def set_fullscreen(self, desktop: bool = False) -> None: ...
-    title: str
-    def destroy(self) -> None: ...
-    def hide(self) -> None: ...
-    def show(self) -> None: ...
-    def focus(self, input_only: bool = False) -> None: ...
-    def restore(self) -> None: ...
-    def maximize(self) -> None: ...
-    def minimize(self) -> None: ...
-    resizable: bool
-    borderless: bool
-    always_on_top: bool
-    def set_icon(self, surface: Surface) -> None: ...
-    id: int
-    size: Iterable[int]
-    position: Union[int, Iterable[int]]
-    opacity: float
-    display_index: int
-    def set_modal_for(self, Window) -> None: ...
+from pygame._window import Window as Window
 
 _Window = Window
 

buildconfig/stubs/pygame/_window.pyi

@@ -1,16 +1,17 @@
-from typing import Iterable, Optional, Tuple, Union, final
-from pygame.surface import Surface
-from ._common import RectValue
+from typing import Optional, Tuple, Union, final
+
+from pygame._common import Coordinate
 from pygame.locals import WINDOWPOS_UNDEFINED
+from pygame.surface import Surface
 
 def get_grabbed_window() -> Optional[Window]: ...
 @final
 class Window:
     def __init__(
         self,
         title: str = "pygame window",
-        size: Iterable[int] = (640, 480),
-        position: Union[int, Iterable[int]] = WINDOWPOS_UNDEFINED,
+        size: Coordinate = (640, 480),
+        position: Union[int, Coordinate] = WINDOWPOS_UNDEFINED,
         **flags: bool
     ) -> None: ...
     def destroy(self) -> None: ...
@@ -24,16 +25,26 @@ class Window:
     def minimize(self) -> None: ...
     def set_modal_for(self, parent: Window) -> None: ...
     def set_icon(self, icon: Surface) -> None: ...
+
     grab: bool
     title: str
     resizable: bool
     borderless: bool
     always_on_top: bool
     relative_mouse: bool
-    id: int
-    size: Iterable[int]
-    position: Union[int, Iterable[int]]
     opacity: float
-    display_index: int
+
+    @property
+    def id(self) -> int: ...
+    @property
+    def display_index(self) -> int: ...
+    @property
+    def size(self) -> Tuple[int, int]: ...
+    @size.setter
+    def size(self, value: Coordinate) -> None: ...
+    @property
+    def position(self) -> Tuple[int, int]: ...
+    @position.setter
+    def position(self, value: Union[int, Coordinate]) -> None: ...
     @classmethod
     def from_display_module(cls) -> Window: ...