diff --git a/CHANGELOG.md b/CHANGELOG.md index b391038c..4c41eb9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,21 @@ 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** +- **Alternate.cur** added in Windows package +- `minimumFrames` frames handler added for animated cursors in **bibata-core** + ### Changed - Files download reference change to [pling.com](https://www.pling.com/p/1197198/) in `PLING.bbcode` - Scripts in `package.json` +- 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 @@ -134,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/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..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 = { @@ -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/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: 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/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 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/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++; } } 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 ); } 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" */ 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/modern/src/svg/static/x_cursor.svg b/packages/modern/src/svg/static/x_cursor.svg index 601bca30..735f754b 100644 --- a/packages/modern/src/svg/static/x_cursor.svg +++ b/packages/modern/src/svg/static/x_cursor.svg @@ -1,14 +1,14 @@ + d="M32.6659 32.6659L32.6659 32.6659C26.4447 38.8871 26.4447 48.9736 32.6659 55.1948L77.9711 100.5L32.6659 145.805C26.4447 152.026 26.4447 162.113 32.6659 168.334C38.8871 174.555 48.9736 174.555 55.1948 168.334L100.5 123.029L145.805 168.334C152.026 174.555 162.113 174.555 168.334 168.334C174.555 162.113 174.555 152.026 168.334 145.805L123.029 100.5L168.334 55.1948C174.555 48.9736 174.555 38.8871 168.334 32.6659C162.113 26.4447 152.026 26.4447 145.805 32.6659L100.5 77.9711L55.1948 32.6659C48.9736 26.4447 38.8871 26.4447 32.6659 32.6659Z" + fill="white" stroke="white" stroke-width="10" stroke-linecap="round" stroke-linejoin="round" /> - 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": { diff --git a/packages/original/src/svg/static/x_cursor.svg b/packages/original/src/svg/static/x_cursor.svg index 601bca30..735f754b 100644 --- a/packages/original/src/svg/static/x_cursor.svg +++ b/packages/original/src/svg/static/x_cursor.svg @@ -1,14 +1,14 @@ + d="M32.6659 32.6659L32.6659 32.6659C26.4447 38.8871 26.4447 48.9736 32.6659 55.1948L77.9711 100.5L32.6659 145.805C26.4447 152.026 26.4447 162.113 32.6659 168.334C38.8871 174.555 48.9736 174.555 55.1948 168.334L100.5 123.029L145.805 168.334C152.026 174.555 162.113 174.555 168.334 168.334C174.555 162.113 174.555 152.026 168.334 145.805L123.029 100.5L168.334 55.1948C174.555 48.9736 174.555 38.8871 168.334 32.6659C162.113 26.4447 152.026 26.4447 145.805 32.6659L100.5 77.9711L55.1948 32.6659C48.9736 26.4447 38.8871 26.4447 32.6659 32.6659Z" + fill="white" stroke="white" stroke-width="10" stroke-linecap="round" stroke-linejoin="round" /> -