Merge pull request #83 from ful1e5/dev

Bibata v1.0.3

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

CURSORS.md

@@ -44,7 +44,7 @@
 |  <img src="./packages/modern/src/svg/static/sb_h_double_arrow.svg" width="20%"/>  |  <img src="./packages/original/src/svg/static/sb_h_double_arrow.svg" width="20%"/>  |  sb_h_double_arrow.svg  |             `None`              |    `SizeWE.cur`     |
 |    <img src="./packages/modern/src/svg/static/sb_left_arrow.svg" width="20%"/>    |    <img src="./packages/original/src/svg/static/sb_left_arrow.svg" width="20%"/>    |    sb_left_arrow.svg    |             `None`              |                     |
 |   <img src="./packages/modern/src/svg/static/sb_right_arrow.svg" width="20%"/>    |   <img src="./packages/original/src/svg/static/sb_right_arrow.svg" width="20%"/>    |   sb_right_arrow.svg    |             `None`              |                     |
-|     <img src="./packages/modern/src/svg/static/sb_up_arrow.svg" width="20%"/>     |     <img src="./packages/original/src/svg/static/sb_up_arrow.svg" width="20%"/>     |     sb_up_arrow.svg     |             `None`              |    `UpArrow.cur`    |
+|     <img src="./packages/modern/src/svg/static/sb_up_arrow.svg" width="20%"/>     |     <img src="./packages/original/src/svg/static/sb_up_arrow.svg" width="20%"/>     |     sb_up_arrow.svg     |             `None`              |   `Alternate.cur`   |
 |  <img src="./packages/modern/src/svg/static/sb_v_double_arrow.svg" width="20%"/>  |  <img src="./packages/original/src/svg/static/sb_v_double_arrow.svg" width="20%"/>  |  sb_v_double_arrow.svg  |             `None`              |    `SizeNS.cur`     |
 |      <img src="./packages/modern/src/svg/static/top_side.svg" width="20%"/>       |      <img src="./packages/original/src/svg/static/top_side.svg" width="20%"/>       |      top_side.svg       |             `None`              |                     |
 |     <img src="./packages/modern/src/svg/static/bottom_side.svg" width="20%"/>     |     <img src="./packages/original/src/svg/static/bottom_side.svg" width="20%"/>     |     bottom_side.svg     |             `None`              |                     |

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 @@
     "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",
 }
 

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

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:

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",

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"

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",

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",

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++;
         }
       }

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
         );
       }

packages/core/src/types.ts

@@ -5,7 +5,7 @@ interface Frames {
 }
 
 /**
- * Hex Colors in string Formate.
+ * Hex Colors in string Format.
  *
  * `Example: `"#FFFFFF"
  */

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": {

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": {