From e616f06803604577f748bc5e4b0f69c313f44171 Mon Sep 17 00:00:00 2001
From: ful1e5 <24286590+ful1e5@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:37:55 +0530
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=F0=9F=94=A7=20Windows=20Cursor=20c?=
 =?UTF-8?q?anvas=20dynamic=20size=20in=20"build.py"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 builder/bbpkg/configure.py |  6 ------
 builder/build.py           | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/builder/bbpkg/configure.py b/builder/bbpkg/configure.py
index 4f4cbda4..44461f1c 100644
--- a/builder/bbpkg/configure.py
+++ b/builder/bbpkg/configure.py
@@ -82,12 +82,6 @@ def get_config(bitmaps_dir: Union[str, Path], **kwargs) -> Dict[str, Any]:
             canvas_size = win_data.get("canvas_size", w_canvas_size)
             win_size = win_data.get("size", w_size)
 
-            # Because provided cursor size is bigger than cursor's canvas.
-            # Also, "position" settings will not effect on cursor because the
-            # cursor's canvas and cursor sizes are equals.
-            if (win_size[0] > canvas_size[0]) | (win_size[1] > canvas_size[1]):
-                canvas_size = win_size
-
             config[key] = {
                 **data,
                 "win_key": win_key,
diff --git a/builder/build.py b/builder/build.py
index 319d7c3f..d7fe7c9a 100644
--- a/builder/build.py
+++ b/builder/build.py
@@ -94,7 +94,8 @@ parser.add_argument(
 # Preparing build
 args = parser.parse_args()
 
-bitmaps_dir = Path(args.png_dir).absolute()
+bitmaps_dir = Path(args.png_dir)
+
 name = bitmaps_dir.stem
 comments = {
     "Bibata-Modern-Classic": "Dark & Rounded-edge Bibata",
@@ -104,22 +105,27 @@ comments = {
     "Bibata-Modern-Ice": "Light & Rounded-edge Bibata",
     "Bibata-Original-Ice": "Light & Sharp-edge Bibata",
 }
+info = Info(name=name, comment=comments.get(name, f"{name} Cursors"))
 
 
 x_out_dir = Path(args.out_dir) / name
 win_out_dir = Path(args.out_dir) / f"{name}-Windows"
 
-print(f"Getting '{name}' bitmaps ready for build...")
+# Windows Canvas & Cursor sizes
+win_size: int = args.win_size
+win_canvas_size: int = args.win_canvas_size
+if win_canvas_size < win_size:
+    win_canvas_size = win_size
 
+
+print(f"Getting '{name}' bitmaps ready for build...")
 config = get_config(
     bitmaps_dir,
     x_sizes=args.xsizes,
-    win_canvas_size=args.win_canvas_size,
-    win_size=args.win_size,
+    win_canvas_size=win_canvas_size,
+    win_size=win_size,
 )
 
-info = Info(name=name, comment=comments.get(name, f"{name} Cursors"))
-
 if args.platform == "unix":
     xbuild(config, x_out_dir, info)
 elif args.platform == "windows":