mirrors/Bibata_Cursor
1
0
Fork 0
mirror of https://github.com/ful1e5/Bibata_Cursor.git synced 2025-05-29 06:15:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #83 from ful1e5/dev

Browse source 
Bibata v1.0.3
This commit is contained in:
Kaiz 2020-11-10 10:10:38 +05:30 • committed by GitHub
commit dc57c1a159
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 46 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGELOG.md
View file

@ -7,10 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [unreleased] ## [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 ### Changed
- Files download reference change to [pling.com](https://www.pling.com/p/1197198/) in `PLING.bbcode` - Files download reference change to [pling.com](https://www.pling.com/p/1197198/) in `PLING.bbcode`
- Scripts in `package.json` - 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 ## [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 🎊 - 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.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.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 [v1.0.0]: https://github.com/ful1e5/Bibata_Cursor/compare/v0.4.2...v1.0.0

2
CURSORS.md
View file

@ -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_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_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_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/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/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` | | | <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` | |

6
builder/bundler.py
View file

@ -2,9 +2,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import shutil import shutil
from os import path, listdir, rename, remove from os import listdir, path, remove, rename
from .config import ConfigProvider
from .config import ConfigProvider
# Windows Cursors Config # Windows Cursors Config
windows_cursors = { windows_cursors = {
@ -21,7 +21,7 @@ windows_cursors = {
"sb_v_double_arrow.cur": "SizeNS.cur", "sb_v_double_arrow.cur": "SizeNS.cur",
"fd_double_arrow.cur": "SizeNESW.cur", "fd_double_arrow.cur": "SizeNESW.cur",
"sb_h_double_arrow.cur": "SizeWE.cur", "sb_h_double_arrow.cur": "SizeWE.cur",
"sb_up_arrow.cur": "UpArrow.cur", "right_ptr.cur": "Alternate.cur",
"wait.ani": "Wait.ani", "wait.ani": "Wait.ani",
} }

4
builder/config.py
View file

@ -1,11 +1,11 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import sys
import json import json
import shutil import shutil
from os import path, mkdir import sys
import tempfile import tempfile
from os import mkdir, path
from . import __path__ from . import __path__
from .pkg_info import info from .pkg_info import info

5
builder/cursor.py
View file

@ -1,9 +1,10 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from clickgen import build_cursor_theme, build_win_cursor_theme, build_x11_cursor_theme
from .bundler import Bundler from .bundler import Bundler
from .config import ConfigProvider, hotspots, sizes, delay from .config import ConfigProvider, delay, hotspots, sizes
from clickgen import build_x11_cursor_theme, build_cursor_theme, build_win_cursor_theme
class CursorBuilder: class CursorBuilder:

2
builder/pkg_info.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
__version__ = "1.0.2" __version__ = "1.0.3"
info = { info = {
"pkg_name": "builder", "pkg_name": "builder",

4
builder/windows.inf
View file

@ -29,7 +29,7 @@ HKCU,"Control Panel\Cursors\Schemes","%SCHEME_NAME%",,"%10%\%CUR_DIR%\%pointer%,
"SizeNWSE.cur" "SizeNWSE.cur"
"SizeNESW.cur" "SizeNESW.cur"
"SizeAll.cur" "SizeAll.cur"
"UpArrow.cur" "Alternate.cur"
"Hand.cur" "Hand.cur"
[Strings] [Strings]
@ -48,5 +48,5 @@ horz = "SizeWE.cur"
dgn1 = "SizeNWSE.cur" dgn1 = "SizeNWSE.cur"
dgn2 = "SizeNESW.cur" dgn2 = "SizeNESW.cur"
move = "SizeAll.cur" move = "SizeAll.cur"
alternate = "UpArrow.cur" alternate = "Alternate.cur"
link = "Hand.cur" link = "Hand.cur"

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "bibata-cursor", "name": "bibata-cursor",
"version": "1.0.2", "version": "1.0.3",
"description": "Material Based Cursors 🚀", "description": "Material Based Cursors 🚀",
"main": "index.js", "main": "index.js",
"author": "Kaiz Khatri", "author": "Kaiz Khatri",

2
packages/core/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "bibata-core", "name": "bibata-core",
"version": "1.0.2", "version": "1.0.3",
"description": "Bibata core package", "description": "Bibata core package",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

4
packages/core/src/BitmapsGenerator.ts
View file

@ -15,6 +15,7 @@ import { matchImages } from "./utils/matchImages";
export class BitmapsGenerator { export class BitmapsGenerator {
private readonly staticCurs: Cursors; private readonly staticCurs: Cursors;
private readonly animatedCurs: Cursors; private readonly animatedCurs: Cursors;
private readonly minimumFrames: number = 30;
/** /**
* @param source `BitmapsGenerator` Class's object arguments. * @param source `BitmapsGenerator` Class's object arguments.
@ -151,11 +152,10 @@ export class BitmapsGenerator {
img2Buff: newFrame img2Buff: newFrame
}); });
if (matched) { if (matched && index > this.minimumFrames) {
breakRendering = true; breakRendering = true;
} else { } else {
frames[key] = { buffer: newFrame }; frames[key] = { buffer: newFrame };
setTimeout(() => {}, 1);
index++; index++;
} }
} }

12
packages/core/src/SvgHandler/ColoredSvgGenerator.ts
View file

@ -47,9 +47,9 @@ export default class ColoredSvgGenerator {
let content = fs.readFileSync(cursor, "utf-8").toString(); let content = fs.readFileSync(cursor, "utf-8").toString();
content = content content = content
.replace(new RegExp(keyColors.base, "g"), this.themeConfig.colors.base) .replace(new RegExp(keyColors.base, "ig"), this.themeConfig.colors.base)
.replace( .replace(
new RegExp(keyColors.outline, "g"), new RegExp(keyColors.outline, "ig"),
this.themeConfig.colors.outline this.themeConfig.colors.outline
); );
@ -69,9 +69,9 @@ export default class ColoredSvgGenerator {
let content = fs.readFileSync(cursor, "utf-8").toString(); let content = fs.readFileSync(cursor, "utf-8").toString();
content = content content = content
.replace(new RegExp(keyColors.base, "g"), this.themeConfig.colors.base) .replace(new RegExp(keyColors.base, "ig"), this.themeConfig.colors.base)
.replace( .replace(
new RegExp(keyColors.outline, "g"), new RegExp(keyColors.outline, "ig"),
this.themeConfig.colors.outline this.themeConfig.colors.outline
); );
@ -83,14 +83,14 @@ export default class ColoredSvgGenerator {
} }
const { background: b } = this.themeConfig.colors.watch; const { background: b } = this.themeConfig.colors.watch;
content = content.replace( content = content.replace(
new RegExp(keyColors.watch!.background, "g"), new RegExp(keyColors.watch!.background, "ig"),
b b
); // Watch Background ); // Watch Background
} catch (error) { } catch (error) {
// === on error => replace `watch` color as `base` === // === on error => replace `watch` color as `base` ===
content = content.replace( content = content.replace(
new RegExp(keyColors.watch!.background, "g"), new RegExp(keyColors.watch!.background, "ig"),
this.themeConfig.colors.base this.themeConfig.colors.base
); );
} }

2
packages/core/src/types.ts
View file

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

2
packages/modern/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "bibata-modern", "name": "bibata-modern",
"version": "1.0.2", "version": "1.0.3",
"description": "Rounded edges bibata cursors 🏳️‍🌈", "description": "Rounded edges bibata cursors 🏳️‍🌈",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

8
packages/modern/src/svg/static/x_cursor.svg
View file

@ -1,14 +1,14 @@
<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d)"> <g filter="url(#filter0_d)">
<path <path
d="M32 148.046C32 145.931 40.6676 135.314 51.2614 124.452C61.8552 113.59 72.0646 103.044 73.949 101.015C75.8334 98.9868 73.8762 87.2123 69.5996 74.8498C60.7401 49.2395 59.9325 40.7233 66.0482 37.4C74.4071 32.8577 85.8788 39.568 95.5082 54.6323L105.263 69.8937L123.583 54.0854C135.629 43.6909 144.227 39.0615 148.691 40.5675C157.523 43.5473 162.62 55.2072 155.945 57.1632C148.37 59.3834 117.017 101.335 117.077 109.171C117.105 112.881 121.56 122.73 126.976 131.057C130.797 136.931 135.932 141.565 133.894 144.751L122.996 161.781C120.883 165.084 113.076 156.278 103.828 147.73L87.6948 132.819L69.8101 151.468C59.9735 161.725 50.7901 170.064 49.4024 170C48.0148 169.935 32 150.16 32 148.046Z" 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"
stroke="white" stroke-width="20" stroke-linejoin="round" /> fill="white" stroke="white" stroke-width="10" stroke-linecap="round" stroke-linejoin="round" />
<path <path
d="M32 148.046C32 145.931 40.6676 135.314 51.2614 124.452C61.8552 113.59 72.0646 103.044 73.949 101.015C75.8334 98.9868 73.8762 87.2123 69.5996 74.8498C60.7401 49.2395 59.9325 40.7233 66.0482 37.4C74.4071 32.8577 85.8788 39.568 95.5082 54.6323L105.263 69.8937L123.583 54.0854C135.629 43.6909 144.227 39.0615 148.691 40.5675C157.523 43.5473 162.62 55.2072 155.945 57.1632C148.37 59.3834 117.017 101.335 117.077 109.171C117.105 112.881 121.56 122.73 126.976 131.057C130.797 136.931 135.932 141.565 133.894 144.751L122.996 161.781C120.883 165.084 113.076 156.278 103.828 147.73L87.6948 132.819L69.8101 151.468C59.9735 161.725 50.7901 170.064 49.4024 170C48.0148 169.935 32 150.16 32 148.046Z" d="M164.799 51.6592L115.958 100.5L164.799 149.341C169.067 153.609 169.067 160.53 164.799 164.799C160.53 169.067 153.609 169.067 149.341 164.799L100.5 115.958L51.6592 164.799C47.3907 169.067 40.47 169.067 36.2014 164.799C31.9329 160.53 31.9329 153.609 36.2014 149.341L85.0422 100.5L36.2014 51.6592C31.9329 47.3907 31.9329 40.47 36.2014 36.2014C40.47 31.9329 47.3907 31.9329 51.6592 36.2014L100.5 85.0422L149.341 36.2014C153.609 31.9329 160.53 31.9329 164.799 36.2014C169.067 40.47 169.067 47.3907 164.799 51.6592Z"
fill="black" /> fill="black" />
</g> </g>
<defs> <defs>
<filter id="filter0_d" x="18" y="25.9934" width="155.001" height="162.006" filterUnits="userSpaceOnUse" <filter id="filter0_d" x="19" y="23" width="163" height="163" filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"> color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix" /> <feFlood flood-opacity="0" result="BackgroundImageFix" />
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" /> <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

2
packages/original/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "bibata-original", "name": "bibata-original",
"version": "1.0.2", "version": "1.0.3",
"description": "Sharp edges bibata cursors 🏳️‍🌈", "description": "Sharp edges bibata cursors 🏳️‍🌈",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

8
packages/original/src/svg/static/x_cursor.svg
View file

@ -1,14 +1,14 @@
<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d)"> <g filter="url(#filter0_d)">
<path <path
d="M32 148.046C32 145.931 40.6676 135.314 51.2614 124.452C61.8552 113.59 72.0646 103.044 73.949 101.015C75.8334 98.9868 73.8762 87.2123 69.5996 74.8498C60.7401 49.2395 59.9325 40.7233 66.0482 37.4C74.4071 32.8577 85.8788 39.568 95.5082 54.6323L105.263 69.8937L123.583 54.0854C135.629 43.6909 144.227 39.0615 148.691 40.5675C157.523 43.5473 162.62 55.2072 155.945 57.1632C148.37 59.3834 117.017 101.335 117.077 109.171C117.105 112.881 121.56 122.73 126.976 131.057C130.797 136.931 135.932 141.565 133.894 144.751L122.996 161.781C120.883 165.084 113.076 156.278 103.828 147.73L87.6948 132.819L69.8101 151.468C59.9735 161.725 50.7901 170.064 49.4024 170C48.0148 169.935 32 150.16 32 148.046Z" 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"
stroke="white" stroke-width="20" stroke-linejoin="round" /> fill="white" stroke="white" stroke-width="10" stroke-linecap="round" stroke-linejoin="round" />
<path <path
d="M32 148.046C32 145.931 40.6676 135.314 51.2614 124.452C61.8552 113.59 72.0646 103.044 73.949 101.015C75.8334 98.9868 73.8762 87.2123 69.5996 74.8498C60.7401 49.2395 59.9325 40.7233 66.0482 37.4C74.4071 32.8577 85.8788 39.568 95.5082 54.6323L105.263 69.8937L123.583 54.0854C135.629 43.6909 144.227 39.0615 148.691 40.5675C157.523 43.5473 162.62 55.2072 155.945 57.1632C148.37 59.3834 117.017 101.335 117.077 109.171C117.105 112.881 121.56 122.73 126.976 131.057C130.797 136.931 135.932 141.565 133.894 144.751L122.996 161.781C120.883 165.084 113.076 156.278 103.828 147.73L87.6948 132.819L69.8101 151.468C59.9735 161.725 50.7901 170.064 49.4024 170C48.0148 169.935 32 150.16 32 148.046Z" d="M164.799 51.6592L115.958 100.5L164.799 149.341C169.067 153.609 169.067 160.53 164.799 164.799C160.53 169.067 153.609 169.067 149.341 164.799L100.5 115.958L51.6592 164.799C47.3907 169.067 40.47 169.067 36.2014 164.799C31.9329 160.53 31.9329 153.609 36.2014 149.341L85.0422 100.5L36.2014 51.6592C31.9329 47.3907 31.9329 40.47 36.2014 36.2014C40.47 31.9329 47.3907 31.9329 51.6592 36.2014L100.5 85.0422L149.341 36.2014C153.609 31.9329 160.53 31.9329 164.799 36.2014C169.067 40.47 169.067 47.3907 164.799 51.6592Z"
fill="black" /> fill="black" />
</g> </g>
<defs> <defs>
<filter id="filter0_d" x="18" y="25.9934" width="155.001" height="162.006" filterUnits="userSpaceOnUse" <filter id="filter0_d" x="19" y="23" width="163" height="163" filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"> color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix" /> <feFlood flood-opacity="0" result="BackgroundImageFix" />
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" /> <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After