diff --git a/README.md b/README.md index 5b3a89e..915c651 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@

- + + +

PlainColor

@@ -14,12 +16,14 @@

- + + +

### Download -- macOS: dmg +- macOS: dmg - Windows: Coming soon... - Linux: Coming soon... @@ -33,10 +37,11 @@ ##### Critical -- Crash when cursor is close to screen sides -- Lense cannot be dragged on top of the macOS menubar - Lense cannot be dragged on top of fullscreen windows - Lense is lagging when picking on another screen and virtual desktop + - Optimize picker loop: Move `setInterval` to rust, FE invokes only event loop start and end +- Better user experience with macOS permissions +- PlainColor process is active after app closed (?) ##### Palette @@ -49,20 +54,15 @@ - Tray icon - Picker shortcut `Command + Shift + M` - Instant picker shortcut `Ctrl + Shift + M` (?) -- Lense: Press `C` to copy color instantly (what to copy? - need a setting for this) - Add Settings window ##### Lense improvements +- Press `C` to copy color instantly (what to copy? - need a setting for this) - Control zoom level with `+` and `-` keys -- Hard to target specific pixel with touchpad, ColorSlurp is much more responsive -- Try to use tauri `cursor_position` function to retrieve mouse coordinates - -##### Optimizations - -- Optimize picker loop: Move `setInterval` to rust, FE invokes only event loop start and end +- Move picker with arrows (step = 1px) -##### Fun stuff +##### Fun stuff / Quality improvements - Add picker sound (Water drop sound) - Prepend one color (Use background color) diff --git a/docs/index.html b/docs/index.html deleted file mode 100644 index 4d95856..0000000 --- a/docs/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - Redirecting... - - -

- If you are not redirected automatically, follow this link. -

- - diff --git a/package.json b/package.json index 2c1fe17..19e9651 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,14 @@ { "name": "plain-color", - "private": true, - "version": "1.0.1", + "private": false, + "version": "1.0.2", "type": "module", "scripts": { "dev": "vite", "build": "tsc && vite build", "preview": "vite preview", - "tauri": "tauri" + "t:dev": "tauri dev", + "t:build": "tauri build" }, "dependencies": { "@phosphor-icons/react": "^2.1.7", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index eb5e73e..185f0c6 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -4,12 +4,15 @@ version = 3 [[package]] name = "PlainColor" -version = "1.0.1" +version = "1.0.2" dependencies = [ + "appkit-nsworkspace-bindings", "base64 0.22.1", + "cocoa", + "core-graphics 0.24.0", "image 0.24.9", - "mouse_position", - "screenshots", + "objc", + "once_cell", "serde", "serde_json", "tauri", @@ -81,6 +84,16 @@ version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +[[package]] +name = "appkit-nsworkspace-bindings" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062382938604cfa02c03689ab75af0e7eb79175ba0d0b2bcfad18f5190702dd7" +dependencies = [ + "bindgen", + "objc", +] + [[package]] name = "arboard" version = "3.4.1" @@ -156,10 +169,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] -name = "bit_field" -version = "0.10.2" +name = "bindgen" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.87", + "which", +] [[package]] name = "bitflags" @@ -336,6 +366,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfb" version = "0.7.3" @@ -382,6 +421,17 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading 0.8.5", +] + [[package]] name = "clipboard-win" version = "5.4.0" @@ -402,7 +452,7 @@ dependencies = [ "cocoa-foundation", "core-foundation 0.10.0", "core-graphics 0.24.0", - "foreign-types 0.5.0", + "foreign-types", "libc", "objc", ] @@ -469,19 +519,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types 0.3.2", - "libc", -] - [[package]] name = "core-graphics" version = "0.23.2" @@ -491,7 +528,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", "core-graphics-types 0.1.3", - "foreign-types 0.5.0", + "foreign-types", "libc", ] @@ -504,7 +541,7 @@ dependencies = [ "bitflags 2.6.0", "core-foundation 0.10.0", "core-graphics-types 0.2.0", - "foreign-types 0.5.0", + "foreign-types", "libc", ] @@ -557,37 +594,12 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "crypto-common" version = "0.1.6" @@ -670,17 +682,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - [[package]] name = "deranged" version = "0.3.11" @@ -741,20 +742,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "display-info" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba4b5ddb26d674c9cd40b7a747e42658ffe1289843615b838532f660e0e3dd0" -dependencies = [ - "anyhow", - "core-graphics 0.23.2", - "fxhash", - "widestring", - "windows 0.52.0", - "xcb", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -766,15 +753,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading", -] - [[package]] name = "dlopen2" version = "0.7.0" @@ -798,12 +776,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - [[package]] name = "dpi" version = "0.1.1" @@ -907,21 +879,6 @@ version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" -[[package]] -name = "exr" -version = "1.73.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" -dependencies = [ - "bit_field", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - [[package]] name = "fdeflate" version = "0.3.6" @@ -937,7 +894,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.1", + "memoffset", "rustc_version", ] @@ -966,15 +923,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - [[package]] name = "foreign-types" version = "0.5.0" @@ -982,7 +930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared 0.3.1", + "foreign-types-shared", ] [[package]] @@ -996,12 +944,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "foreign-types-shared" version = "0.3.1" @@ -1259,16 +1201,6 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gimli" version = "0.31.1" @@ -1423,16 +1355,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -1469,6 +1391,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "html5ever" version = "0.26.0" @@ -1748,13 +1679,8 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif", - "jpeg-decoder", "num-traits", "png", - "qoi", - "tiff", ] [[package]] @@ -1810,17 +1736,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.10.1" @@ -1908,9 +1823,6 @@ name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" @@ -1997,10 +1909,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] -name = "lebe" -version = "0.5.2" +name = "lazycell" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libappindicator" @@ -2022,7 +1934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" dependencies = [ "gtk-sys", - "libloading", + "libloading 0.7.4", "once_cell", ] @@ -2033,23 +1945,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] -name = "libdbus-sys" -version = "0.2.5" +name = "libloading" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cc", - "pkg-config", + "cfg-if", + "winapi", ] [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.6", ] [[package]] @@ -2062,22 +1974,6 @@ dependencies = [ "libc", ] -[[package]] -name = "libwayshot" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "896d0e594158b7f5188034836a6c4886492078352c39760786e54f1b796caaea" -dependencies = [ - "image 0.24.9", - "log", - "memmap2", - "nix", - "thiserror", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", -] - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -2147,24 +2043,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -2180,6 +2058,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2202,17 +2086,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "mouse_position" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824feb0675ad2ffda7b1da534f394c5779fb39d123b5f376a221d50fad54b3c2" -dependencies = [ - "core-graphics 0.22.3", - "winapi", - "x11-dl", -] - [[package]] name = "muda" version = "0.15.3" @@ -2269,25 +2142,22 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", -] - [[package]] name = "nodrop" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -2658,6 +2528,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + [[package]] name = "percent-encoding" version = "2.3.1" @@ -2824,7 +2700,7 @@ checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", "indexmap 2.6.0", - "quick-xml 0.32.0", + "quick-xml", "serde", "time", ] @@ -2863,6 +2739,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "prettyplease" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" +dependencies = [ + "proc-macro2", + "syn 2.0.87", +] + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -2922,33 +2808,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - [[package]] name = "quick-xml" version = "0.32.0" @@ -3054,26 +2913,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - [[package]] name = "redox_syscall" version = "0.5.7" @@ -3166,6 +3005,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc_version" version = "0.4.1" @@ -3230,37 +3075,12 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "screenshots" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038df8746dbf7d8b70715d638470db956794e0f3d08608e4197f4053c2da1620" -dependencies = [ - "anyhow", - "core-graphics 0.22.3", - "dbus", - "display-info", - "fxhash", - "image 0.24.9", - "libwayshot", - "percent-encoding", - "widestring", - "windows 0.51.1", - "xcb", -] - [[package]] name = "selectors" version = "0.22.0" @@ -3511,7 +3331,7 @@ dependencies = [ "bytemuck", "cfg_aliases", "core-graphics 0.24.0", - "foreign-types 0.5.0", + "foreign-types", "js-sys", "log", "objc2", @@ -3696,7 +3516,7 @@ dependencies = [ "tao-macros", "unicode-segmentation", "url", - "windows 0.58.0", + "windows", "windows-core 0.58.0", "windows-version", "x11-dl", @@ -3766,7 +3586,7 @@ dependencies = [ "webkit2gtk", "webview2-com", "window-vibrancy", - "windows 0.58.0", + "windows", ] [[package]] @@ -3929,7 +3749,7 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "windows 0.58.0", + "windows", ] [[package]] @@ -3954,7 +3774,7 @@ dependencies = [ "url", "webkit2gtk", "webview2-com", - "windows 0.58.0", + "windows", "wry", ] @@ -4501,80 +4321,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wayland-backend" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" -dependencies = [ - "cc", - "downcast-rs", - "io-lifetimes", - "nix", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.30.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" -dependencies = [ - "bitflags 1.3.2", - "nix", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" -dependencies = [ - "bitflags 1.3.2", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" -dependencies = [ - "bitflags 1.3.2", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" -dependencies = [ - "proc-macro2", - "quick-xml 0.28.2", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" -dependencies = [ - "dlib", - "log", - "pkg-config", -] - [[package]] name = "web-sys" version = "0.3.72" @@ -4637,7 +4383,7 @@ checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.58.0", + "windows", "windows-core 0.58.0", "windows-implement", "windows-interface", @@ -4661,7 +4407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" dependencies = [ "thiserror", - "windows 0.58.0", + "windows", "windows-core 0.58.0", ] @@ -4672,10 +4418,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] -name = "widestring" -version = "1.1.0" +name = "which" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] [[package]] name = "winapi" @@ -4722,26 +4474,6 @@ dependencies = [ "windows-version", ] -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.58.0" @@ -4752,15 +4484,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-core" version = "0.52.0" @@ -5124,7 +4847,7 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.58.0", + "windows", "windows-core 0.58.0", "windows-version", "x11-dl", @@ -5168,17 +4891,6 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" -[[package]] -name = "xcb" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e75181b5a62b6eeaa72f303d3cef7dbb841e22885bf6d3e66fe23e88c55dc6" -dependencies = [ - "bitflags 1.3.2", - "libc", - "quick-xml 0.30.0", -] - [[package]] name = "yoke" version = "0.7.4" @@ -5266,12 +4978,3 @@ dependencies = [ "quote", "syn 2.0.87", ] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 9b42d15..1dbbd2f 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "PlainColor" -version = "1.0.1" +version = "1.0.2" description = "A Tauri App" authors = ["Eugene Volynko "] edition = "2021" @@ -26,8 +26,13 @@ image = { version = "0.24.9", default-features = false, features = ["png"] } termcolor = "1.2.0" tauri-plugin-clipboard-manager = "2.0.1" base64 = "0.22.1" -mouse_position = "0.1.4" -screenshots = "0.8.10" tauri-plugin-os = "2" tauri-plugin-process = "2.0.0" +once_cell = "1.20.2" +appkit-nsworkspace-bindings = "0.1.2" +objc = "0.2.7" +core-graphics = "0.24" + +[target.'cfg(target_os = "macos")'.dependencies] +cocoa = "0.26.0" diff --git a/src-tauri/Info.plist b/src-tauri/Info.plist new file mode 100644 index 0000000..181a193 --- /dev/null +++ b/src-tauri/Info.plist @@ -0,0 +1,8 @@ + + + + + LSUIElement + + + \ No newline at end of file diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 81649f9..c09454b 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1,35 +1,118 @@ use base64::{engine::general_purpose, Engine as _}; -use image::{DynamicImage, GenericImageView, ImageFormat}; -use mouse_position::mouse_position::Mouse; -use screenshots::Screen; -use std::io::Cursor; +use core_graphics::display::{CGDisplay, CGPoint, CGRect, CGSize}; +use image::{DynamicImage, GenericImageView, ImageFormat, Rgb, RgbImage, Rgba}; +use once_cell::sync::Lazy; +use std::{io::Cursor, sync::Mutex}; use tauri::{ menu::{Menu, PredefinedMenuItem, Submenu}, // tray::TrayIconBuilder, AppHandle, Emitter, EventTarget, - LogicalPosition, Manager, + PhysicalPosition, }; -fn get_screen_area(x: i32, y: i32, w: u32, h: u32) -> DynamicImage { - // Get the screen object for the specified coordinates - let screen = Screen::from_point(x, y).expect("Failed to get screen"); +static GLOBAL_PICKER_WINDOW: Lazy>> = + Lazy::new(|| Mutex::new(None)); - let target_w = (w as f32) / screen.display_info.scale_factor; - let target_h = (h as f32) / screen.display_info.scale_factor; +fn get_display_from_coordinates(x: f64, y: f64) -> Option { + let valid_x = x.max(0 as f64); + let valid_y = y.max(0 as f64); - // Round to the nearest integer and then cast to u32 - let rounded_w = target_w.round() as u32; - let rounded_h = target_h.round() as u32; + // Get the active displays (Vec, each representing a display ID) + let displays = CGDisplay::active_displays().unwrap(); - // Capture the specified area on the screen - let area = screen - .capture_area(x, y, rounded_w, rounded_h) - .expect("Failed to capture area"); + // Iterate through the display IDs + for display_id in displays { + let display = CGDisplay::new(display_id); - DynamicImage::ImageRgba8(area) + // Get the bounds of the display using the display ID + let bounds = CGDisplay::bounds(&display); + + let point = CGPoint::new(valid_x, valid_y); + + // Check if the point (x, y) is inside the display's bounds + if bounds.contains(&point) { + return Some(display); // Return the display ID if the point is within its bounds + } + } + + None // Return None if no display contains the point +} + +fn capture_screenshot( + physical_x: f64, + physical_y: f64, + physical_width: f64, + physical_height: f64, + scale_factor: f64, +) -> Option { + let logical_x: f64 = (physical_x / scale_factor).round(); + let logical_y: f64 = (physical_y / scale_factor).round(); + let logical_width: f64 = (physical_width / scale_factor).round(); + let logical_height: f64 = (physical_height / scale_factor).round(); + + // coordinates with offset in all sides + let capture_x = logical_x - 1 as f64; + let capture_y = logical_y - 1 as f64; + let capture_width = logical_width + 2 as f64; + let capture_height = logical_height + 2 as f64; + + if let Some(display) = get_display_from_coordinates(logical_x, logical_y) { + let point = CGPoint::new(capture_x, capture_y); + let size = CGSize::new(capture_width, capture_height); + + // Capture the screenshot of the specified area from the display + let image_data = display.image_for_rect(CGRect::new(&point, &size)).unwrap(); + + let img_width = image_data.width() as u32; + let img_height = image_data.height() as u32; + + // Handle image row stride, if available (some images have extra padding) + let stride = image_data.bytes_per_row() as usize; + + let mut img = RgbImage::new(img_width, img_height); // Create a new image buffer + let data = image_data.data(); // Access the raw pixel data (RGBA) + + let data_len = data.len() as usize; + + // Iterate through each pixel and set it in the image buffer + for y in 0..img_height { + for x in 0..img_width { + // Cast `x` and `y` to `usize` before multiplying with `stride` and `4` + let offset = (y as usize * stride + x as usize * 4) as usize; // Adjust for row stride + + // Ensure the offset is within the bounds of the data array + if offset + 3 < data_len { + let r = data[offset + 2]; + let g = data[offset + 1]; + let b = data[offset]; + + // Set the pixel color in the image + img.put_pixel(x, y, Rgb([r, g, b])); + } + } + } + + // Convert RgbImage to DynamicImage for cropping + let mut dynamic_img = DynamicImage::ImageRgb8(img); + + let crop_x = ((physical_x / scale_factor).trunc() - capture_x) as u32; // Adjust for the offset + let crop_y = ((physical_y / scale_factor).trunc() - capture_y) as u32; + let crop_width = physical_width.round() as u32; + let crop_height = physical_height.round() as u32; + + let cropped = dynamic_img.crop(crop_x, crop_y, crop_width, crop_height); + + Some(cropped) + } else { + println!( + "No display found for coordinates ({}, {})", + physical_x, physical_y + ); + None // Return None if no display is found + } } fn image_to_base64(img: &DynamicImage) -> String { @@ -52,26 +135,42 @@ fn get_center_pixel_color(img: DynamicImage) -> Option<(u8, u8, u8)> { let pixel = img.get_pixel(center_x - 1, center_y - 1); // Convert the pixel to RGB and return its color values - let image::Rgba([r, g, b, _]) = pixel; + let Rgba([r, g, b, _]) = pixel; Some((r, g, b)) } - // Learn more about Tauri commands at https://tauri.app/develop/calling-rust/ #[tauri::command] fn fetch_preview(app: AppHandle, size: u32) { - let position = Mouse::get_mouse_position(); - match position { - Mouse::Position { x, y } => { - // move window to cursor - let win = app.get_webview_window("picker").unwrap(); - win.set_position(LogicalPosition::new(x - 64, y - 64)) - .unwrap(); - - // capture image - let offset = (size / 2) as i32; - let img = get_screen_area(x - offset, y - offset, size, size); + let picker_window_logical_w = 128; + let picker_window_logical_h = 128; + + // move window to cursor + let win: tauri::WebviewWindow = app.get_webview_window("picker").unwrap(); + let scale_factor = win.scale_factor().unwrap(); + + let p_coords: tauri::PhysicalPosition = win.cursor_position().unwrap(); + let picker_window_physical_w = picker_window_logical_w as f64 * scale_factor; + let picker_window_physical_h = picker_window_logical_h as f64 * scale_factor; + win.set_position(PhysicalPosition::new( + p_coords.x as f64 - (picker_window_physical_w / 2 as f64), + p_coords.y as f64 - (picker_window_physical_h / 2 as f64), + )) + .unwrap(); + + // capture image + let offset = (size / 2) as f64; + let img = capture_screenshot( + p_coords.x - offset, + p_coords.y - offset, + size as f64, + size as f64, + scale_factor, + ); + + match img { + Some(img) => { // transform image to base64 let img_base64 = image_to_base64(&img); @@ -86,7 +185,9 @@ fn fetch_preview(app: AppHandle, size: u32) { ) .unwrap(); } - Mouse::Error => println!("Error getting mouse position"), + None => { + println!("No image captured"); + } } } @@ -114,27 +215,126 @@ pub fn run() { }) .plugin(tauri_plugin_process::init()) .plugin(tauri_plugin_os::init()) - .plugin(tauri_plugin_clipboard_manager::init()) .plugin(tauri_plugin_shell::init()) + .plugin(tauri_plugin_clipboard_manager::init()) .invoke_handler(tauri::generate_handler![fetch_preview]) - // .setup(|app| { - // let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?; - // let menu = Menu::with_items(app, &[&quit_i])?; - // TrayIconBuilder::new() - // .icon(app.default_window_icon().unwrap().clone()) - // .menu(&menu) - // .menu_on_left_click(true) - // .on_menu_event(|app, event| match event.id.as_ref() { - // "quit" => { - // app.exit(0); - // } - // _ => { - // println!("menu item {:?} not handled", event.id); - // } - // }) - // .build(app)?; - // Ok(()) - // }) + .setup(|app| { + #[cfg(target_os = "macos")] + app.set_activation_policy(tauri::ActivationPolicy::Accessory); + + let picker_window: tauri::WebviewWindow = app.get_webview_window("picker").unwrap(); + let mut global_picker_screen = GLOBAL_PICKER_WINDOW + .lock() + .expect("Failed to lock GLOBAL_PICKER_WINDOW"); + *global_picker_screen = Some(picker_window.clone()); + + // configure macOS window behavior + #[cfg(target_os = "macos")] + { + use appkit_nsworkspace_bindings::{ + INSNotificationCenter, INSWorkspace, NSWorkspace, + NSWorkspaceActiveSpaceDidChangeNotification, + }; + use cocoa::{ + appkit::{ + NSMainMenuWindowLevel, NSWindow, NSWindowCollectionBehavior, + NSWindowStyleMask, + }, + base::{id, nil}, + foundation::NSPoint, + }; + use objc::declare::ClassDecl; + use objc::runtime::{Object, Sel}; + use objc::{class, msg_send, sel, sel_impl}; + + let ns_win = picker_window.ns_window().unwrap() as id; + + unsafe { + // ns_win.makeKeyAndOrderFront_(nil); + ns_win.setLevel_(((NSMainMenuWindowLevel + 1) as u64).try_into().unwrap()); + // ns_win.setCanHide_(false); + // ns_win.setCollectionBehavior_( + // NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces + // | NSWindowCollectionBehavior::NSWindowCollectionBehaviorFullScreenAuxiliary, + // ); + + extern "C" fn notify_space_changed( + _self: &Object, + _cmd: Sel, + _notification: *mut Object, + ) { + println!("Received application launch notification"); + + let global_picker_window = GLOBAL_PICKER_WINDOW + .lock() + .expect("Failed to lock GLOBAL_PICKER_WINDOW"); + if let Some(picker_window) = &*global_picker_window { + let ns_win = picker_window.ns_window().unwrap() as id; + + unsafe { + println!("Hooray!"); + + // NSWindowCollectionBehavior::NSWindowCollectionBehaviorMoveToActiveSpace + // NSWindowCollectionBehavior::NSWindowCollectionBehaviorFullScreenAuxiliary + // NSWindowCollectionBehaviorStationary + // NSWindowCollectionBehaviorIgnoresCycle + // NSWindowCollectionBehaviorCanJoinAllSpaces + + // ns_win.setLevel_(((NSMainMenuWindowLevel + 1) as u64).try_into().unwrap()); + // ns_win.setStyleMask_(NSWindowStyleMask::NSBorderlessWindowMask); + // ns_win.setCollectionBehavior_( + // NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces + // | NSWindowCollectionBehavior::NSWindowCollectionBehaviorFullScreenAuxiliary, + // ); + // ns_win.orderFrontRegardless(); + + // ns_win.setLevel_(((NSMainMenuWindowLevel + 1) as u64).try_into().unwrap()); + // ns_win.setCanHide_(false); + // ns_win.setCollectionBehavior_( + // NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces + // | NSWindowCollectionBehavior::NSWindowCollectionBehaviorFullScreenAuxiliary, + // ); + } + } + } + + let mut class_decl = ClassDecl::new("RustObserver", class!(NSObject)).unwrap(); + class_decl.add_method( + sel!(notify_space_changed:), + notify_space_changed as extern "C" fn(&Object, Sel, *mut Object), + ); + let observer_class = class_decl.register(); + let observer: *mut Object = msg_send![observer_class, new]; + let name = NSWorkspaceActiveSpaceDidChangeNotification; + + NSWorkspace::sharedWorkspace() + .notificationCenter() + .addObserver_selector_name_object_( + observer, + sel!(notify_space_changed:), + name, + nil, + ); + } + } + + // let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?; + // let menu = Menu::with_items(app, &[&quit_i])?; + // TrayIconBuilder::new() + // .icon(app.default_window_icon().unwrap().clone()) + // .menu(&menu) + // .menu_on_left_click(true) + // .on_menu_event(|app, event| match event.id.as_ref() { + // "quit" => { + // app.exit(0); + // } + // _ => { + // println!("menu item {:?} not handled", event.id); + // } + // }) + // .build(app)?; + Ok(()) + }) .run(tauri::generate_context!()) .expect("error while running tauri application") } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 01f0a97..8371a4a 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "PlainColor", - "version": "1.0.1", + "version": "1.0.2", "identifier": "com.moduleart.plaincolor", "build": { "beforeDevCommand": "yarn dev", @@ -52,7 +52,10 @@ "decorations": false, "contentProtected": true, "visibleOnAllWorkspaces": true, - "fullscreen": false + "fullscreen": false, + "skipTaskbar": true, + "alwaysOnTop": true, + "windowEffects": { "effects": ["fullScreenUI", "hudWindow"] } } ], "security": { diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx index cbbce8a..47e3855 100644 --- a/src/components/Button/index.tsx +++ b/src/components/Button/index.tsx @@ -29,6 +29,7 @@ export const Button: FC = ({ commonComponentClasses(props) )} onClick={() => onClick && onClick()} + title={props.nativeTooltip} > {icon &&
{}
} {label && } diff --git a/src/components/Button/props.ts b/src/components/Button/props.ts index ccc5c6b..8861562 100644 --- a/src/components/Button/props.ts +++ b/src/components/Button/props.ts @@ -9,4 +9,5 @@ export interface IButtonProps extends IPlainlibComponentProps { label?: string size?: 'inline' | 'regular' padding?: 'none' | 'small' | 'medium' | 'large' + nativeTooltip?: string } diff --git a/src/components/ColorCard/index.tsx b/src/components/ColorCard/index.tsx index 37e980b..d409e0b 100644 --- a/src/components/ColorCard/index.tsx +++ b/src/components/ColorCard/index.tsx @@ -3,13 +3,13 @@ import { IColorCardProps } from './props' import { Stack } from '@/components/Stack' import './index.scss' import { Button } from '@/components/Button' -import { Copy, Trash, FloppyDisk, SlidersHorizontal } from '@phosphor-icons/react' +import { Copy, Trash, FloppyDisk, PencilSimple, PlusSquare } from '@phosphor-icons/react' import { Text } from '@/components/Text' import { writeText } from '@tauri-apps/plugin-clipboard-manager' import { hexToRgbStr, isDark } from '@/utils/color.util' import cn from 'classnames' -export const ColorCard: FC = ({ color, onSave, onDelete, onEdit, onColorChange }) => { +export const ColorCard: FC = ({ color, onSave, onDelete, onEdit, onDuplicate, onColorChange }) => { const [copied, setCopied] = useState('') const copyHex = () => { @@ -52,9 +52,30 @@ export const ColorCard: FC = ({ color, onSave, onDelete, onEdit - {onEdit &&