From c0bf8a72e0058a2039d71450afe38cb5c0240742 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Tue, 3 Nov 2020 09:53:38 +0530 Subject: [PATCH 01/10] =?UTF-8?q?=F0=9F=92=AC=20comments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/src/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index 62a54085..c1549fe1 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -5,7 +5,7 @@ interface Frames { } /** - * Hex Colors in string Formate. + * Hex Colors in string Format. * * `Example: `"#FFFFFF" */ From 85577886896df5e1addcbb1d2133868e03642665 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Fri, 6 Nov 2020 09:28:38 +0530 Subject: [PATCH 02/10] =?UTF-8?q?=20=F0=9F=92=96=20#82=20improvement=20to?= =?UTF-8?q?=20X-cursor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + packages/modern/src/svg/static/x_cursor.svg | 37 ++++++++----------- packages/original/src/svg/static/x_cursor.svg | 37 ++++++++----------- 3 files changed, 33 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b391038c..6703b306 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Files download reference change to [pling.com](https://www.pling.com/p/1197198/) in `PLING.bbcode` - Scripts in `package.json` +- #82 improvement to X-cursor (feature request) ## [v1.0.2] - 30 Oct 2020 diff --git a/packages/modern/src/svg/static/x_cursor.svg b/packages/modern/src/svg/static/x_cursor.svg index 601bca30..274c03fd 100644 --- a/packages/modern/src/svg/static/x_cursor.svg +++ b/packages/modern/src/svg/static/x_cursor.svg @@ -1,22 +1,17 @@ - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/packages/original/src/svg/static/x_cursor.svg b/packages/original/src/svg/static/x_cursor.svg index 601bca30..274c03fd 100644 --- a/packages/original/src/svg/static/x_cursor.svg +++ b/packages/original/src/svg/static/x_cursor.svg @@ -1,22 +1,17 @@ - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + From ce3c8873afeba118f2f2cb077d14d80f3b708569 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Fri, 6 Nov 2020 09:50:17 +0530 Subject: [PATCH 03/10] =?UTF-8?q?=E2=9A=A1=20Docs=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/modern/src/svg/static/x_cursor.svg | 37 +++++++++++-------- packages/original/src/svg/static/x_cursor.svg | 37 +++++++++++-------- 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/packages/modern/src/svg/static/x_cursor.svg b/packages/modern/src/svg/static/x_cursor.svg index 274c03fd..735f754b 100644 --- a/packages/modern/src/svg/static/x_cursor.svg +++ b/packages/modern/src/svg/static/x_cursor.svg @@ -1,17 +1,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/original/src/svg/static/x_cursor.svg b/packages/original/src/svg/static/x_cursor.svg index 274c03fd..735f754b 100644 --- a/packages/original/src/svg/static/x_cursor.svg +++ b/packages/original/src/svg/static/x_cursor.svg @@ -1,17 +1,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file From e87593ac447000473a765fad7f468fff7c2de93b Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Fri, 6 Nov 2020 09:51:18 +0530 Subject: [PATCH 04/10] =?UTF-8?q?=F0=9F=8C=88=20#81=20Case=20insensitive?= =?UTF-8?q?=20color=20key=20replacer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/src/SvgHandler/ColoredSvgGenerator.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/src/SvgHandler/ColoredSvgGenerator.ts b/packages/core/src/SvgHandler/ColoredSvgGenerator.ts index 8e8c0bcb..a9171933 100644 --- a/packages/core/src/SvgHandler/ColoredSvgGenerator.ts +++ b/packages/core/src/SvgHandler/ColoredSvgGenerator.ts @@ -47,9 +47,9 @@ export default class ColoredSvgGenerator { let content = fs.readFileSync(cursor, "utf-8").toString(); content = content - .replace(new RegExp(keyColors.base, "g"), this.themeConfig.colors.base) + .replace(new RegExp(keyColors.base, "ig"), this.themeConfig.colors.base) .replace( - new RegExp(keyColors.outline, "g"), + new RegExp(keyColors.outline, "ig"), this.themeConfig.colors.outline ); @@ -69,9 +69,9 @@ export default class ColoredSvgGenerator { let content = fs.readFileSync(cursor, "utf-8").toString(); content = content - .replace(new RegExp(keyColors.base, "g"), this.themeConfig.colors.base) + .replace(new RegExp(keyColors.base, "ig"), this.themeConfig.colors.base) .replace( - new RegExp(keyColors.outline, "g"), + new RegExp(keyColors.outline, "ig"), this.themeConfig.colors.outline ); @@ -83,14 +83,14 @@ export default class ColoredSvgGenerator { } const { background: b } = this.themeConfig.colors.watch; content = content.replace( - new RegExp(keyColors.watch!.background, "g"), + new RegExp(keyColors.watch!.background, "ig"), b ); // Watch Background } catch (error) { // === on error => replace `watch` color as `base` === content = content.replace( - new RegExp(keyColors.watch!.background, "g"), + new RegExp(keyColors.watch!.background, "ig"), this.themeConfig.colors.base ); } From f748962c81291682ba35d89fbb4f8c71267402d7 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Fri, 6 Nov 2020 09:54:37 +0530 Subject: [PATCH 05/10] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20reference=20issues?= =?UTF-8?q?=20in=20logs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6703b306..fa153ca1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] +### Added + +- Case insensitive `colors key` replace in **bibata-core** + ### Changed - Files download reference change to [pling.com](https://www.pling.com/p/1197198/) in `PLING.bbcode` - Scripts in `package.json` -- #82 improvement to X-cursor (feature request) +- fixed #82 improvement to X-cursor (feature request) +- fixed #81 Corner resize cursors are not coloured (bug) ## [v1.0.2] - 30 Oct 2020 From e66af1b7f6ff4036c98e871207b4414f554c63a8 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Fri, 6 Nov 2020 10:00:03 +0530 Subject: [PATCH 06/10] =?UTF-8?q?=E2=9A=A1=20Alternate.cur=20added=20with?= =?UTF-8?q?=20reference=20of=20right=5Fptr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CURSORS.md | 2 +- builder/bundler.py | 2 +- builder/windows.inf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CURSORS.md b/CURSORS.md index 664d1601..0832dd9c 100644 --- a/CURSORS.md +++ b/CURSORS.md @@ -44,7 +44,7 @@ | | | sb_h_double_arrow.svg | `None` | `SizeWE.cur` | | | | sb_left_arrow.svg | `None` | | | | | sb_right_arrow.svg | `None` | | -| | | sb_up_arrow.svg | `None` | `UpArrow.cur` | +| | | sb_up_arrow.svg | `None` | `Alternate.cur` | | | | sb_v_double_arrow.svg | `None` | `SizeNS.cur` | | | | top_side.svg | `None` | | | | | bottom_side.svg | `None` | | diff --git a/builder/bundler.py b/builder/bundler.py index 8c57c568..06147e8b 100644 --- a/builder/bundler.py +++ b/builder/bundler.py @@ -21,7 +21,7 @@ windows_cursors = { "sb_v_double_arrow.cur": "SizeNS.cur", "fd_double_arrow.cur": "SizeNESW.cur", "sb_h_double_arrow.cur": "SizeWE.cur", - "sb_up_arrow.cur": "UpArrow.cur", + "right_ptr.cur": "Alternate.cur", "wait.ani": "Wait.ani", } diff --git a/builder/windows.inf b/builder/windows.inf index 346caeed..c9e11562 100644 --- a/builder/windows.inf +++ b/builder/windows.inf @@ -29,7 +29,7 @@ HKCU,"Control Panel\Cursors\Schemes","%SCHEME_NAME%",,"%10%\%CUR_DIR%\%pointer%, "SizeNWSE.cur" "SizeNESW.cur" "SizeAll.cur" -"UpArrow.cur" +"Alternate.cur" "Hand.cur" [Strings] @@ -48,5 +48,5 @@ horz = "SizeWE.cur" dgn1 = "SizeNWSE.cur" dgn2 = "SizeNESW.cur" move = "SizeAll.cur" -alternate = "UpArrow.cur" +alternate = "Alternate.cur" link = "Hand.cur" \ No newline at end of file From 7fbb14bcf5d9567f5703e8d58b3bfc17957ef908 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Fri, 6 Nov 2020 10:02:16 +0530 Subject: [PATCH 07/10] =?UTF-8?q?=F0=9F=93=A6=20Windows=20package=20log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa153ca1..4de5466d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Case insensitive `colors key` replace in **bibata-core** +- **Alternate.cur** added in Windows package ### Changed - Files download reference change to [pling.com](https://www.pling.com/p/1197198/) in `PLING.bbcode` - Scripts in `package.json` -- fixed #82 improvement to X-cursor (feature request) +- Change reference of **Alternate.cur** to `right_ptr` +- fixed #82 improvement to X-cursor (feature request) - fixed #81 Corner resize cursors are not coloured (bug) ## [v1.0.2] - 30 Oct 2020 From cb9c6aef2b2f7523aa7e4a82caff687139fa9374 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Fri, 6 Nov 2020 10:24:11 +0530 Subject: [PATCH 08/10] =?UTF-8?q?=F0=9F=8E=A5=20Minimum=20Frames=20handler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + packages/core/src/BitmapsGenerator.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4de5466d..1724073a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Case insensitive `colors key` replace in **bibata-core** - **Alternate.cur** added in Windows package +- `minimumFrames` frames handler added for animated cursors in **bibata-core** ### Changed diff --git a/packages/core/src/BitmapsGenerator.ts b/packages/core/src/BitmapsGenerator.ts index c3a81941..4c4a875b 100644 --- a/packages/core/src/BitmapsGenerator.ts +++ b/packages/core/src/BitmapsGenerator.ts @@ -15,6 +15,7 @@ import { matchImages } from "./utils/matchImages"; export class BitmapsGenerator { private readonly staticCurs: Cursors; private readonly animatedCurs: Cursors; + private readonly minimumFrames: number = 30; /** * @param source `BitmapsGenerator` Class's object arguments. @@ -151,11 +152,10 @@ export class BitmapsGenerator { img2Buff: newFrame }); - if (matched) { + if (matched && index > this.minimumFrames) { breakRendering = true; } else { frames[key] = { buffer: newFrame }; - setTimeout(() => {}, 1); index++; } } From 0a04b77717be053084081fd2a2496c3ffbc28ad6 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Sat, 7 Nov 2020 17:57:31 +0530 Subject: [PATCH 09/10] =?UTF-8?q?=E2=9A=A1=20Organize=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- builder/bundler.py | 4 ++-- builder/config.py | 4 ++-- builder/cursor.py | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/builder/bundler.py b/builder/bundler.py index 06147e8b..f12ec7de 100644 --- a/builder/bundler.py +++ b/builder/bundler.py @@ -2,9 +2,9 @@ # -*- coding: utf-8 -*- import shutil -from os import path, listdir, rename, remove -from .config import ConfigProvider +from os import listdir, path, remove, rename +from .config import ConfigProvider # Windows Cursors Config windows_cursors = { diff --git a/builder/config.py b/builder/config.py index 003de519..7f95ab41 100644 --- a/builder/config.py +++ b/builder/config.py @@ -1,11 +1,11 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import sys import json import shutil -from os import path, mkdir +import sys import tempfile +from os import mkdir, path from . import __path__ from .pkg_info import info diff --git a/builder/cursor.py b/builder/cursor.py index f4f7406d..bee1d0c1 100644 --- a/builder/cursor.py +++ b/builder/cursor.py @@ -1,9 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +from clickgen import build_cursor_theme, build_win_cursor_theme, build_x11_cursor_theme + from .bundler import Bundler -from .config import ConfigProvider, hotspots, sizes, delay -from clickgen import build_x11_cursor_theme, build_cursor_theme, build_win_cursor_theme +from .config import ConfigProvider, delay, hotspots, sizes class CursorBuilder: From bd627b54a243ca12cca3e418400816d0766d1b27 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Sat, 7 Nov 2020 18:01:12 +0530 Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=9A=80=20Prepare=20v1.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 ++++- builder/pkg_info.py | 2 +- package.json | 2 +- packages/core/package.json | 2 +- packages/modern/package.json | 2 +- packages/original/package.json | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1724073a..4c41eb9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] +## [v1.0.3] - 7 Nov 2020 + ### Added - Case insensitive `colors key` replace in **bibata-core** @@ -143,7 +145,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Initial release 🎊 -[unreleased]: https://github.com/ful1e5/Bibata_Cursor/compare/v1.0.2...main +[unreleased]: https://github.com/ful1e5/Bibata_Cursor/compare/v1.0.3...main +[v1.0.3]: https://github.com/ful1e5/Bibata_Cursor/compare/v1.0.2...v1.0.3 [v1.0.2]: https://github.com/ful1e5/Bibata_Cursor/compare/v1.0.1...v1.0.2 [v1.0.1]: https://github.com/ful1e5/Bibata_Cursor/compare/v1.0.0...v1.0.1 [v1.0.0]: https://github.com/ful1e5/Bibata_Cursor/compare/v0.4.2...v1.0.0 diff --git a/builder/pkg_info.py b/builder/pkg_info.py index c8fcfea0..e48cd86c 100644 --- a/builder/pkg_info.py +++ b/builder/pkg_info.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -__version__ = "1.0.2" +__version__ = "1.0.3" info = { "pkg_name": "builder", diff --git a/package.json b/package.json index 4811b393..d6c27761 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bibata-cursor", - "version": "1.0.2", + "version": "1.0.3", "description": "Material Based Cursors 🚀", "main": "index.js", "author": "Kaiz Khatri", diff --git a/packages/core/package.json b/packages/core/package.json index 5c4b2258..da3ea460 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "bibata-core", - "version": "1.0.2", + "version": "1.0.3", "description": "Bibata core package", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/modern/package.json b/packages/modern/package.json index d71b188b..fbe4abb2 100644 --- a/packages/modern/package.json +++ b/packages/modern/package.json @@ -1,6 +1,6 @@ { "name": "bibata-modern", - "version": "1.0.2", + "version": "1.0.3", "description": "Rounded edges bibata cursors 🏳️‍🌈", "main": "index.js", "scripts": { diff --git a/packages/original/package.json b/packages/original/package.json index 361ea7dc..e86d8996 100644 --- a/packages/original/package.json +++ b/packages/original/package.json @@ -1,6 +1,6 @@ { "name": "bibata-original", - "version": "1.0.2", + "version": "1.0.3", "description": "Sharp edges bibata cursors 🏳️‍🌈", "main": "index.js", "scripts": {