migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 23:00:04 -04:00
Code Activity

Merge branch 'main' into feat/harfrust-text-shaping

Browse Source 
# Conflicts:
#	crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x1.png
#	crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x2.png
#	crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x1.png
#	crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x2.png
This commit is contained in:
Emil Ernerfeldt
2026-03-29 10:02:11 +02:00
parent 73a1f01fb3 eb35f7d12f
commit 74b128451a
25 changed files with 98 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/egui_demo_lib/tests/misc.rs
View File

@@ -13,8 +13,9 @@ fn test_kerning() {
ui.label("Hello world!");
ui.label("Repeated characters: iiiiiiiiiiiii lllllllll mmmmmmmmmmmmmmmm");
ui.label("Thin spaces: −123 456 789");
ui.label("Ligature: fi :)");
ui.label("\ttabbed");
ui.label("Ligature: fi fl ffi ffl");
ui.label("Kerning: AVATAR");
ui.label("\ttabbed\ttext");
});
harness.run();
harness.fit_contents();

4
crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:af81b4c34c3daebc08633499fd6883e917a83615f5981b12802f112fc25edf07
size 12511
oid sha256:2ef07080ca2aa10e128c646479b8b322a092d63f15b35c52ed59015e7c2a0f60
size 15434

4
crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x2.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21872867be61c9da3aa9a7daffe5c6d3ca49839c4049db4dab3c35531e1b5f82
size 29389
oid sha256:4edb61c6619d5e44892fa29da0aa0a624306ae637dbbaa057e3fa47c14dc06bd
size 35988

4
crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0dfae7e7098ade005adade7ab27336d4301294404d2ecdc0cd29748f5e4f7f5
size 13102
oid sha256:f8da0c2e37497968864a91fa6bef7c545c37791f4f9b788ea9a2f43dd4ac16b1
size 16116

4
crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x2.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9d6dca1082393f24c50b4ed2acf37bfc049d11d9a5e97ed8f69dc7a431039a7
size 31917
oid sha256:2a603fcb2eb97943d6be3239b91cacee093adcb55a6dd14af93a72fc8b3a61fa
size 39270