Skip to content

Commit a3d1c1d

Browse files
authored
Merge pull request #14 from jondkinney/kanso-adoption
Adopt kanso 0.1.0: kinetic scrolling + widget/theme unification
2 parents df02acd + 2873f04 commit a3d1c1d

6 files changed

Lines changed: 366 additions & 811 deletions

File tree

.github/workflows/release.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,20 @@ jobs:
6666
- name: Install Rust toolchain
6767
uses: dtolnay/rust-toolchain@stable
6868

69+
# Bake macOS-style touch-to-stop into the prebuilt (hyprcorrect-bin) only:
70+
# vendored forks add the Wayland hold gesture so kinetic scroll stops on a
71+
# finger-rest. Source / crates.io builds omit this patch and degrade
72+
# gracefully (kanso reads a flag that's simply never written). Pinned by
73+
# rev. Drop once upstreamed — rust-windowing/winit#4585, emilk/egui#8223.
74+
- name: Bake in touchpad hold-to-stop (prebuilt only)
75+
run: |
76+
{
77+
echo ''
78+
echo '[patch.crates-io]'
79+
echo 'winit = { git = "https://github.com/jondkinney/winit-cohort", rev = "ee951c3aa13036b104cb54788465c63c5f8d22a0" }'
80+
echo 'egui-winit = { git = "https://github.com/jondkinney/egui-winit-cohort", rev = "8299c3826a66384b39dbbca545dc5a5d311bb331" }'
81+
} >> Cargo.toml
82+
6983
- name: Build release binary
7084
env:
7185
# Strip workspace + cargo paths out of the binary so
@@ -151,6 +165,18 @@ jobs:
151165
- name: Install Rust toolchain
152166
uses: dtolnay/rust-toolchain@stable
153167

168+
# Bake macOS-style touch-to-stop into the prebuilt (hyprcorrect-bin) only —
169+
# see the x86_64 job above. Pinned by rev; drop once upstreamed
170+
# (rust-windowing/winit#4585, emilk/egui#8223).
171+
- name: Bake in touchpad hold-to-stop (prebuilt only)
172+
run: |
173+
{
174+
echo ''
175+
echo '[patch.crates-io]'
176+
echo 'winit = { git = "https://github.com/jondkinney/winit-cohort", rev = "ee951c3aa13036b104cb54788465c63c5f8d22a0" }'
177+
echo 'egui-winit = { git = "https://github.com/jondkinney/egui-winit-cohort", rev = "8299c3826a66384b39dbbca545dc5a5d311bb331" }'
178+
} >> Cargo.toml
179+
154180
- name: Build release binary
155181
env:
156182
RUSTFLAGS: --remap-path-prefix=${{ github.workspace }}=/build --remap-path-prefix=/home/runner/.cargo=/cargo

Cargo.lock

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/hyprcorrect-ui/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ hyprcorrect-core.workspace = true
1313
hyprcorrect-platform.workspace = true
1414
eframe.workspace = true
1515
egui.workspace = true
16+
# Shared egui design system, published to crates.io.
17+
kanso = "0.1"
1618
resvg.workspace = true
1719
tiny-skia.workspace = true
1820
usvg.workspace = true
-859 KB
Binary file not shown.

0 commit comments

Comments
 (0)