From cf9d734dcd9e68edf9a4a561b1cf2af30d844bed Mon Sep 17 00:00:00 2001 From: Sergey Shashkov Date: Thu, 14 Nov 2024 15:13:46 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D1=80=D0=B8=D0=BC=D1=8B=D0=BA?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE=D1=81=D0=B5=D0=B4=D0=BD?= =?UTF-8?q?=D0=B8=D1=85=20=D0=BF=D1=80=D1=8F=D0=BC=D0=BE=D1=83=D0=B3=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docs.yml | 2 +- setup.py | 4 ++-- src/drawzero/__about__.py | 2 +- src/drawzero/utils/converters.py | 8 +++++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 585df9d..e17970b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,4 +1,4 @@ -name: ci +name: docs on: push: branches: diff --git a/setup.py b/setup.py index 38c0b8e..f0c3d03 100644 --- a/setup.py +++ b/setup.py @@ -108,13 +108,13 @@ def run(self): 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Programming Language :: Python :: Implementation :: CPython', - 'Topic :: Multimedia :: Graphics', ], # $ setup.py publish support. cmdclass={ diff --git a/src/drawzero/__about__.py b/src/drawzero/__about__.py index 5991b3e..888c433 100644 --- a/src/drawzero/__about__.py +++ b/src/drawzero/__about__.py @@ -5,7 +5,7 @@ "__copyright__", ] -__version__ = '0.4.4' +__version__ = '0.4.5' __author__ = "Sergey Shashkov" __license__ = "MIT" __copyright__ = "Copyright 2020- Sergey Shashkov" diff --git a/src/drawzero/utils/converters.py b/src/drawzero/utils/converters.py index 4f6ea08..f7591da 100644 --- a/src/drawzero/utils/converters.py +++ b/src/drawzero/utils/converters.py @@ -136,7 +136,13 @@ def _to_rect(rect: List, error: BadDrawParmsError) -> Optional[Tuple[int, int, i error.errors.append(I18N.use_rect_correct) return None x, y, w, h = rect - return to_canvas_x(x), to_canvas_y(y), to_canvas_x(w), to_canvas_y(h) + cx = to_canvas_x(x) + cy = to_canvas_y(y) + cxw = to_canvas_x(x+w) + cyh = to_canvas_y(y+h) + cw = cxw - cx + ch = cyh - cy + return cx, cy, cw, ch def _to_points_list(points: Union[list, tuple], error: BadDrawParmsError) -> Optional[List[Tuple[int, int]]]: