migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-06-26 22:53:14 -04:00
Code Activity

Merge branch 'main' into fonts-cleanup

Browse Source
This commit is contained in:
Emil Ernerfeldt
2025-09-08 16:55:27 +02:00
parent 197ec85a3e e5d0b93633
commit b00f5283c5
17 changed files with 103 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/labels.yml vendored
View File

@@ -30,4 +30,4 @@ jobs:
with:
mode: minimum
count: 1
labels: "CI, dependencies, docs and examples, ecolor, eframe, egui_extras, egui_glow, egui_kittest, egui-wgpu, egui-winit, egui, epaint, epaint_default_fonts, exclude from changelog, typo"
labels: "CI, dependencies, docs and examples, ecolor, eframe, egui_extras, egui_glow, egui_kittest, egui-wgpu, egui-winit, egui, emath, epaint, epaint_default_fonts, exclude from changelog, typo"

8
CHANGELOG.md
View File

@@ -14,6 +14,14 @@ This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
## 0.32.2 - 2025-09-04
* Fix: `SubMenu` should not display when ui is disabled [#7428](https://github.com/emilk/egui/pull/7428) by [@ozwaldorf](https://github.com/ozwaldorf)
* Remove line breaks when pasting into single line TextEdit [#7441](https://github.com/emilk/egui/pull/7441) by [@YgorSouza](https://github.com/YgorSouza)
* Panic mutexes that can't lock for 30 seconds, in debug builds [#7468](https://github.com/emilk/egui/pull/7468) by [@emilk](https://github.com/emilk)
* Add `Ui::place`, to place widgets without changing the cursor [#7359](https://github.com/emilk/egui/pull/7359) by [@lucasmerlin](https://github.com/lucasmerlin)
* Fix: prevent calendar popup from closing on dropdown change [#7409](https://github.com/emilk/egui/pull/7409) by [@AStrizh](https://github.com/AStrizh)
## 0.32.1 - 2025-08-15 - Misc bug fixes
### ⭐ Added
* Add `ComboBox::popup_style` [#7360](https://github.com/emilk/egui/pull/7360) by [@lucasmerlin](https://github.com/lucasmerlin)

32
Cargo.lock
View File

@@ -1196,7 +1196,7 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
[[package]]
name = "ecolor"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"bytemuck",
"cint",
@@ -1208,7 +1208,7 @@ dependencies = [
[[package]]
name = "eframe"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"ahash",
"bytemuck",
@@ -1247,7 +1247,7 @@ dependencies = [
[[package]]
name = "egui"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"accesskit",
"ahash",
@@ -1267,7 +1267,7 @@ dependencies = [
[[package]]
name = "egui-wgpu"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"ahash",
"bytemuck",
@@ -1285,7 +1285,7 @@ dependencies = [
[[package]]
name = "egui-winit"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"accesskit_winit",
"arboard",
@@ -1305,7 +1305,7 @@ dependencies = [
[[package]]
name = "egui_demo_app"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"bytemuck",
"chrono",
@@ -1333,7 +1333,7 @@ dependencies = [
[[package]]
name = "egui_demo_lib"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"chrono",
"criterion",
@@ -1350,7 +1350,7 @@ dependencies = [
[[package]]
name = "egui_extras"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"ahash",
"chrono",
@@ -1369,7 +1369,7 @@ dependencies = [
[[package]]
name = "egui_glow"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"bytemuck",
"document-features",
@@ -1388,7 +1388,7 @@ dependencies = [
[[package]]
name = "egui_kittest"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"dify",
"document-features",
@@ -1404,7 +1404,7 @@ dependencies = [
[[package]]
name = "egui_tests"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"egui",
"egui_extras",
@@ -1434,7 +1434,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "emath"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"bytemuck",
"document-features",
@@ -1531,7 +1531,7 @@ dependencies = [
[[package]]
name = "epaint"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"ab_glyph",
"ahash",
@@ -1553,7 +1553,7 @@ dependencies = [
[[package]]
name = "epaint_default_fonts"
version = "0.32.1"
version = "0.32.2"
[[package]]
name = "equivalent"
@@ -3239,7 +3239,7 @@ checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
[[package]]
name = "popups"
version = "0.32.1"
version = "0.32.2"
dependencies = [
"eframe",
"env_logger",
@@ -5487,7 +5487,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
[[package]]
name = "xtask"
version = "0.32.1"
version = "0.32.2"
[[package]]
name = "yaml-rust"

26
Cargo.toml
View File

@@ -24,7 +24,7 @@ members = [
edition = "2024"
license = "MIT OR Apache-2.0"
rust-version = "1.86"
version = "0.32.1"
version = "0.32.2"
[profile.release]
@@ -55,18 +55,18 @@ opt-level = 2
[workspace.dependencies]
emath = { version = "0.32.1", path = "crates/emath", default-features = false }
ecolor = { version = "0.32.1", path = "crates/ecolor", default-features = false }
epaint = { version = "0.32.1", path = "crates/epaint", default-features = false }
epaint_default_fonts = { version = "0.32.1", path = "crates/epaint_default_fonts" }
egui = { version = "0.32.1", path = "crates/egui", default-features = false }
egui-winit = { version = "0.32.1", path = "crates/egui-winit", default-features = false }
egui_extras = { version = "0.32.1", path = "crates/egui_extras", default-features = false }
egui-wgpu = { version = "0.32.1", path = "crates/egui-wgpu", default-features = false }
egui_demo_lib = { version = "0.32.1", path = "crates/egui_demo_lib", default-features = false }
egui_glow = { version = "0.32.1", path = "crates/egui_glow", default-features = false }
egui_kittest = { version = "0.32.1", path = "crates/egui_kittest", default-features = false }
eframe = { version = "0.32.1", path = "crates/eframe", default-features = false }
emath = { version = "0.32.2", path = "crates/emath", default-features = false }
ecolor = { version = "0.32.2", path = "crates/ecolor", default-features = false }
epaint = { version = "0.32.2", path = "crates/epaint", default-features = false }
epaint_default_fonts = { version = "0.32.2", path = "crates/epaint_default_fonts" }
egui = { version = "0.32.2", path = "crates/egui", default-features = false }
egui-winit = { version = "0.32.2", path = "crates/egui-winit", default-features = false }
egui_extras = { version = "0.32.2", path = "crates/egui_extras", default-features = false }
egui-wgpu = { version = "0.32.2", path = "crates/egui-wgpu", default-features = false }
egui_demo_lib = { version = "0.32.2", path = "crates/egui_demo_lib", default-features = false }
egui_glow = { version = "0.32.2", path = "crates/egui_glow", default-features = false }
egui_kittest = { version = "0.32.2", path = "crates/egui_kittest", default-features = false }
eframe = { version = "0.32.2", path = "crates/eframe", default-features = false }
accesskit = "0.19.0"
accesskit_winit = "0.27"

4
crates/ecolor/CHANGELOG.md
View File

@@ -6,6 +6,10 @@ This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
## 0.32.2 - 2025-09-04
Nothing new
## 0.32.1 - 2025-08-15
Nothing new

4
crates/eframe/CHANGELOG.md
View File

@@ -7,6 +7,10 @@ This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
## 0.32.2 - 2025-09-04
Nothing new
## 0.32.1 - 2025-08-15
* Enable wgpu default features in eframe / egui_wgpu default features [#7344](https://github.com/emilk/egui/pull/7344) by [@lucasmerlin](https://github.com/lucasmerlin)
* Request a redraw when the url change through the `popstate` event listener [#7403](https://github.com/emilk/egui/pull/7403) by [@irevoire](https://github.com/irevoire)

4
crates/egui-wgpu/CHANGELOG.md
View File

@@ -6,6 +6,10 @@ This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
## 0.32.2 - 2025-09-04
Nothing new
## 0.32.1 - 2025-08-15
* Enable wgpu default features in eframe / egui_wgpu default features [#7344](https://github.com/emilk/egui/pull/7344) by [@lucasmerlin](https://github.com/lucasmerlin)

4
crates/egui-winit/CHANGELOG.md
View File

@@ -5,6 +5,10 @@ This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
## 0.32.2 - 2025-09-04
Nothing new
## 0.32.1 - 2025-08-15
* Update to winit 0.30.12 [#7420](https://github.com/emilk/egui/pull/7420) by [@emilk](https://github.com/emilk)

2
crates/egui/src/widgets/label.rs
View File

@@ -282,7 +282,7 @@ impl Widget for Label {
if ui.is_rect_visible(response.rect) {
if show_tooltip_when_elided && galley.elided {
// Show the full (non-elided) text on hover:
response = response.on_hover_text(galley.text());
response = response.on_hover_text(galley.job.clone());
}
let response_color = if interactive {

5
crates/egui_extras/CHANGELOG.md
View File

@@ -5,6 +5,11 @@ This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
## 0.32.2 - 2025-09-04
* Fix memory leak when `forget_image` is called while loading [#7380](https://github.com/emilk/egui/pull/7380) by [@Vanadiae](https://github.com/Vanadiae)
* Fix deadlock in `ImageLoader`, `FileLoader`, `EhttpLoader` [#7494](https://github.com/emilk/egui/pull/7494) by [@lucasmerlin](https://github.com/lucasmerlin)
## 0.32.1 - 2025-08-15
Nothing new

4
crates/egui_glow/CHANGELOG.md
View File

@@ -6,6 +6,10 @@ Changes since the last release can be found at <https://github.com/emilk/egui/co
## 0.32.2 - 2025-09-04
Nothing new
## 0.32.1 - 2025-08-15
Nothing new

4
crates/egui_kittest/CHANGELOG.md
View File

@@ -6,6 +6,10 @@ This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
## 0.32.2 - 2025-09-04
* Allow masking widgets in kittest snapshots [#7467](https://github.com/emilk/egui/pull/7467) by [@lucasmerlin](https://github.com/lucasmerlin)
## 0.32.1 - 2025-08-15
* Fix `UPDATE_SNAPSHOTS`: only update if we didn't pass the test [#7455](https://github.com/emilk/egui/pull/7455) by [@emilk](https://github.com/emilk)

5
crates/epaint/CHANGELOG.md
View File

@@ -5,6 +5,11 @@ This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
## 0.32.2 - 2025-09-04
* Panic mutexes that can't lock for 30 seconds, in debug builds [#7468](https://github.com/emilk/egui/pull/7468) by [@emilk](https://github.com/emilk)
* Skip zero-length layout job sections [#7430](https://github.com/emilk/egui/pull/7430) by [@HactarCE](https://github.com/HactarCE)
## 0.32.1 - 2025-08-15
* Fix multi-line `TextShape` rotation [#7404](https://github.com/emilk/egui/pull/7404) by [@afishhh](https://github.com/afishhh)
* Fix glyph rendering: clamp coverage to [0, 1] [#7415](https://github.com/emilk/egui/pull/7415) by [@emilk](https://github.com/emilk)

4
crates/epaint_default_fonts/CHANGELOG.md
View File

@@ -5,6 +5,10 @@ This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
## 0.32.2 - 2025-09-04
Nothing new
## 0.32.1 - 2025-08-15
Nothing new

1
scripts/generate_changelog.py
View File

@@ -272,6 +272,7 @@ def main() -> None:
"egui-wgpu",
"egui-winit",
"egui",
"emath",
"epaint",
"epaint_default_fonts",
]

23
tests/egui_tests/tests/regression_tests.rs
View File

@@ -1,4 +1,4 @@
use egui::{Image, include_image};
use egui::{Color32, Image, Label, RichText, TextWrapMode, include_image};
use egui_kittest::Harness;
use egui_kittest::kittest::Queryable as _;
@@ -12,3 +12,24 @@ fn image_button_should_have_alt_text() {
harness.get_by_label("Egui");
}
#[test]
fn hovering_should_preserve_text_format() {
let mut harness = Harness::builder().with_size((200.0, 70.0)).build_ui(|ui| {
ui.add(
Label::new(
RichText::new("Long text that should be elided and has lots of styling")
.italics()
.underline()
.color(Color32::LIGHT_BLUE),
)
.wrap_mode(TextWrapMode::Truncate),
);
});
harness.get_by_label_contains("Long text").hover();
harness.run_steps(5);
harness.snapshot("hovering_should_preserve_text_format");
}

3
tests/egui_tests/tests/snapshots/hovering_should_preserve_text_format.png Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc03cdc22b410ed90fdbbc45ced5c61027463132c490673170aab9044d683f88
size 10254