From 1be59b4732af8ab0a61d2aa71247e0885e877b12 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Tue, 9 Feb 2021 12:08:35 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20#37=20Set=20Pointer=20Cursor's?= =?UTF-8?q?=20hotspot=20to=20top=20left=20edge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit builder/Makefile: - Adds python3 'virtualenv' compatibility in 'setup' make target. builder/applbuild/constants.py: - Hotspots changes for All Pointer cursor in macOSBigSur. --- builder/Makefile | 4 ++-- builder/applbuild/constants.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/builder/Makefile b/builder/Makefile index 4776919..7adf18a 100644 --- a/builder/Makefile +++ b/builder/Makefile @@ -21,7 +21,7 @@ clean: @fi setup: setup.py - @test -d venv || virtualenv venv + @test -d venv || python3 -m venv venv @. venv/bin/activate; python3 setup.py install --record files.txt build: setup build.py @@ -31,4 +31,4 @@ build_unix: setup build.py @. venv/bin/activate; python3 build.py unix --xsizes $(X_SIZES) build_windows: setup build.py - @. venv/bin/activate; python3 build.py windows --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE) \ No newline at end of file + @. venv/bin/activate; python3 build.py windows --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE) diff --git a/builder/applbuild/constants.py b/builder/applbuild/constants.py index 9564dbe..f67db6f 100644 --- a/builder/applbuild/constants.py +++ b/builder/applbuild/constants.py @@ -25,16 +25,16 @@ X_CURSORS_CFG: Dict[str, Dict[str, int]] = { "bottom_right_corner.png": {"xhot": 100, "yhot": 100}, "bottom_tee.png": {"xhot": 98, "yhot": 137}, "center_ptr.png": {"xhot": 100, "yhot": 70}, - "context-menu.png": {"xhot": 43, "yhot": 61}, - "copy.png": {"xhot": 67, "yhot": 46}, + "context-menu.png": {"xhot": 29, "yhot": 28}, + "copy.png": {"xhot": 54, "yhot": 13}, "cross.png": {"xhot": 100, "yhot": 100}, - "crossed_circle.png": {"xhot": 67, "yhot": 46}, + "crossed_circle.png": {"xhot": 54, "yhot": 13}, "crosshair.png": {"xhot": 100, "yhot": 100}, "dnd_no_drop.png": {"xhot": 100, "yhot": 100}, "dotbox.png": {"xhot": 100, "yhot": 100}, "hand1.png": {"xhot": 94, "yhot": 72}, "hand2.png": {"xhot": 67, "yhot": 46}, - "left_ptr.png": {"xhot": 69, "yhot": 56}, + "left_ptr.png": {"xhot": 53, "yhot": 13}, "left_side.png": {"xhot": 100, "yhot": 100}, "left_tee.png": {"xhot": 100, "yhot": 100}, "link.png": {"xhot": 120, "yhot": 55}, @@ -44,7 +44,7 @@ X_CURSORS_CFG: Dict[str, Dict[str, int]] = { "pencil.png": {"xhot": 81, "yhot": 117}, "plus.png": {"xhot": 98, "yhot": 100}, "question_arrow.png": {"xhot": 99, "yhot": 99}, - "right_ptr.png": {"xhot": 136, "yhot": 66}, + "right_ptr.png": {"xhot": 154, "yhot": 24}, "right_tee.png": {"xhot": 98, "yhot": 99}, "sb_down_arrow.png": {"xhot": 100, "yhot": 100}, "sb_h_double_arrow.png": {"xhot": 100, "yhot": 100}, @@ -66,7 +66,7 @@ X_CURSORS_CFG: Dict[str, Dict[str, int]] = { # Animated # ############ # Note: Animated cursors don't need an extension and frame numbers. - "left_ptr_watch": {"xhot": 67, "yhot": 46}, + "left_ptr_watch": {"xhot": 54, "yhot": 13}, "wait": {"xhot": 100, "yhot": 100}, }