Skip to content

Commit f8d5d4c

Browse files
emilkabey79Wumpf
authored
Update to egui master (#6448)
* Uses: rerun-io/egui_tiles#67 * Uses: lampsitter/egui_commonmark#51 * Split off from #6171 * Closes #5280 ### Test * [x] image loading * [x] gltf ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested the web demo (if applicable): * Using examples from latest `main` build: [rerun.io/viewer](https://rerun.io/viewer/pr/6448?manifest_url=https://app.rerun.io/version/main/examples_manifest.json) * Using full set of examples from `nightly` build: [rerun.io/viewer](https://rerun.io/viewer/pr/6448?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json) * [x] The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG * [x] If applicable, add a new check to the [release checklist](https://github.com/rerun-io/rerun/blob/main/tests/python/release_checklist)! - [PR Build Summary](https://build.rerun.io/pr/6448) - [Recent benchmark results](https://build.rerun.io/graphs/crates.html) - [Wasm size tracking](https://build.rerun.io/graphs/sizes.html) To run all checks from `main`, comment on the PR with `@rerun-bot full-check`. # egui changelog so far Full diff at https://github.com/emilk/egui/compare/0.27.0..HEAD #### ecolor * Fix `hex_color!` macro by re-exporting `color_hex` crate from `ecolor` [#4372](emilk/egui#4372) (thanks [@dataphract](https://github.com/dataphract)!) * Remove `extra_asserts` and `extra_debug_asserts` feature flags [#4478](emilk/egui#4478) #### eframe * Add `register_native_texture` in `eframe::Frame` [#4246](emilk/egui#4246) (thanks [@Chaojimengnan](https://github.com/Chaojimengnan)!) * Early-out from context switching the `glow` backend [#4284](emilk/egui#4284) * Fix `ViewportCommand::InnerSize` not resizing viewport on Wayland (#4211) [#4211](emilk/egui#4211) (thanks [@rustbasic](https://github.com/rustbasic)!) * Only avoid glow context switching on Windows [#4296](emilk/egui#4296) * Improve IME support with new `Event::Ime` [#4358](emilk/egui#4358) (thanks [@rustbasic](https://github.com/rustbasic)!) * Allow users to create viewports larger than monitor on Windows & macOS [#4337](emilk/egui#4337) (thanks [@lopo12123](https://github.com/lopo12123)!) * Use `objc2` and its framework crates [#4395](emilk/egui#4395) (thanks [@madsmtm](https://github.com/madsmtm)!) * Update to Rust 1.76 [#4411](emilk/egui#4411) * Egui-winit: emit physical key presses when a non-Latin layout is active [#4461](emilk/egui#4461) (thanks [@TicClick](https://github.com/TicClick)!) * IME for chinese [#4436](emilk/egui#4436) (thanks [@rustbasic](https://github.com/rustbasic)!) * Fix : In Windows, the 'egui_demo_app' screen does not appear. [#4410](emilk/egui#4410) (thanks [@rustbasic](https://github.com/rustbasic)!) * Fix: Window position creeps between executions on scaled monitors [#4443](emilk/egui#4443) (thanks [@avery-radmacher](https://github.com/avery-radmacher)!) * Update `image` crate to 0.25 [#4160](emilk/egui#4160) * Ignore synthetic key presses [#4514](emilk/egui#4514) (thanks [@hut](https://github.com/hut)!) * Fix: still track mouse when dragging outside web canvas [#4522](emilk/egui#4522) * Add `NativeOptions::persistence_path` [#4423](emilk/egui#4423) (thanks [@lucasmerlin](https://github.com/lucasmerlin)!) * Use ResizeObserver instead of `resize` event [#4536](emilk/egui#4536) (thanks [@jprochazk](https://github.com/jprochazk)!) * Fix: Don't `.forget()` RAF closure [#4551](emilk/egui#4551) (thanks [@jprochazk](https://github.com/jprochazk)!) #### egui_extras * Update `image` crate to 0.25 [#4160](emilk/egui#4160) #### egui_plot * `Plot::Items:allow_hover` give possibility to masked the interaction on hovered item [#2558](emilk/egui#2558) (thanks [@haricot](https://github.com/haricot)!) * Expose `ClosestElem` and `PlotConfig` [#4380](emilk/egui#4380) (thanks [@Narcha](https://github.com/Narcha)!) * Disable interaction for `ScrollArea` and `Plot` when UI is disabled [#4457](emilk/egui#4457) (thanks [@varphone](https://github.com/varphone)!) * Make sure plot size is positive [#4429](emilk/egui#4429) (thanks [@rustbasic](https://github.com/rustbasic)!) * Introduce lifetime to `egui_plot::Plot` to replace `'static` fields [#4435](emilk/egui#4435) (thanks [@Fabus1184](https://github.com/Fabus1184)!) * Hide all other series when alt-clicking in the legend [#4549](emilk/egui#4549) (thanks [@abey79](https://github.com/abey79)!) * Plot now respects the `interact_radius` set in the UI's style [#4520](emilk/egui#4520) (thanks [@YgorSouza](https://github.com/YgorSouza)!) #### egui_glow * Enable egui_glow's winit feature on wasm (#4420) [#4421](emilk/egui#4421) (thanks [@simon-frankau](https://github.com/simon-frankau)!) #### egui-wgpu * Update to wgpu 0.20 [#4433](emilk/egui#4433) (thanks [@KeKsBoTer](https://github.com/KeKsBoTer)!) * Revert update to wgpu 0.20 => downgrade to wgpu 0.19.1 [#4559](emilk/egui#4559) #### egui-winit * Update `webbrowser` to `v1.0.0` [#4394](emilk/egui#4394) (thanks [@torokati44](https://github.com/torokati44)!) * Emit physical key presses when a non-Latin layout is active [#4461](emilk/egui#4461) (thanks [@TicClick](https://github.com/TicClick)!) * IME for chinese [#4436](emilk/egui#4436) (thanks [@rustbasic](https://github.com/rustbasic)!) * Fix: Window position creeps between executions on scaled monitors [#4443](emilk/egui#4443) (thanks [@avery-radmacher](https://github.com/avery-radmacher)!) * Ignore synthetic key presses [#4514](emilk/egui#4514) (thanks [@hut](https://github.com/hut)!) #### egui * Improve the UI for changing the egui theme [#4257](emilk/egui#4257) * Change the resize cursor when you reach the resize limit [#4275](emilk/egui#4275) * Make `TextEdit` an atomic widget [#4276](emilk/egui#4276) * Overload operators for `Rect + Margin`, `Rect - Margin` etc [#4277](emilk/egui#4277) * Implement blinking text cursor in `TextEdit` [#4279](emilk/egui#4279) * Rename `fn scroll2` to `fn scroll` [#4282](emilk/egui#4282) * Change `Frame::multiply_with_opacity` to multiply in gamma space [#4283](emilk/egui#4283) * Support order on windows [#4301](emilk/egui#4301) (thanks [@alexparlett](https://github.com/alexparlett)!) * Fix wrong replacement function in deprecation notice of `drag_released*` [#4314](emilk/egui#4314) (thanks [@sornas](https://github.com/sornas)!) * Consider layer transform when positioning text agent [#4319](emilk/egui#4319) (thanks [@juancampa](https://github.com/juancampa)!) * Fix incorrect line breaks [#4377](emilk/egui#4377) (thanks [@juancampa](https://github.com/juancampa)!) * Fix `hex_color!` macro by re-exporting `color_hex` crate from `ecolor` [#4372](emilk/egui#4372) (thanks [@dataphract](https://github.com/dataphract)!) * Change `Ui::allocate_painter` to inherit properties from `Ui` [#4343](emilk/egui#4343) (thanks [@varphone](https://github.com/varphone)!) * Use parent `Ui`s style for popups [#4325](emilk/egui#4325) (thanks [@alexparlett](https://github.com/alexparlett)!) * Fix : take `rounding` into account when using `Slider::trailing_fill` [#4308](emilk/egui#4308) (thanks [@rustbasic](https://github.com/rustbasic)!) * Add a way to specify Undoer settings and construct Undoers more easily [#4357](emilk/egui#4357) (thanks [@valadaptive](https://github.com/valadaptive)!) * Add xtask crate [#4293](emilk/egui#4293) (thanks [@YgorSouza](https://github.com/YgorSouza)!) * Add `ViewportCommand::RequestCut`, `RequestCopy` and `RequestPaste` to trigger Clipboard actions [#4035](emilk/egui#4035) (thanks [@bu5hm4nn](https://github.com/bu5hm4nn)!) * Fix `Panel` incorrect size [#4351](emilk/egui#4351) (thanks [@zhatuokun](https://github.com/zhatuokun)!) * Improve IME support with new `Event::Ime` [#4358](emilk/egui#4358) (thanks [@rustbasic](https://github.com/rustbasic)!) * Allow users to create viewports larger than monitor on Windows & macOS [#4337](emilk/egui#4337) (thanks [@lopo12123](https://github.com/lopo12123)!) * Added ability to define colors at UV coordinates along a path [#4353](emilk/egui#4353) (thanks [@murl-digital](https://github.com/murl-digital)!) * Eframe: update ViewportBuilder.with_icon() documentation [#4408](emilk/egui#4408) (thanks [@roccoblues](https://github.com/roccoblues)!) * Update to Rust 1.76 [#4411](emilk/egui#4411) * Add a `Display` impl for `Vec2`, `Pos2`, and `Rect` [#4428](emilk/egui#4428) (thanks [@tgross35](https://github.com/tgross35)!) * Remove `extra_asserts` and `extra_debug_asserts` feature flags [#4478](emilk/egui#4478) * Egui-winit: emit physical key presses when a non-Latin layout is active [#4461](emilk/egui#4461) (thanks [@TicClick](https://github.com/TicClick)!) * Disable interaction for `ScrollArea` and `Plot` when UI is disabled [#4457](emilk/egui#4457) (thanks [@varphone](https://github.com/varphone)!) * Update ahash 0.8.6 -> 0.8.11 [#4507](emilk/egui#4507) (thanks [@hellodword](https://github.com/hellodword)!) * `include_image!` now accepts expressions [#4521](emilk/egui#4521) (thanks [@YgorSouza](https://github.com/YgorSouza)!) * Remove `Event::Scroll` and handle it in egui [#4524](emilk/egui#4524) * Remove scroll latency for smooth trackpads [#4526](emilk/egui#4526) * Smooth out zooming with discreet scroll wheel [#4530](emilk/egui#4530) * Add `Options::line_scroll_speed` and `scroll_zoom_speed` [#4532](emilk/egui#4532) * Don't panic when replacement glyph is not found [#4542](emilk/egui#4542) (thanks [@RyanBluth](https://github.com/RyanBluth)!) * Make `TextEdit::return_key` optional [#4543](emilk/egui#4543) (thanks [@doonv](https://github.com/doonv)!) * Add `TextEdit::hint_text_font` [#4517](emilk/egui#4517) (thanks [@zaaarf](https://github.com/zaaarf)!) * Add `Options::reduce_texture_memory` to free up RAM [#4431](emilk/egui#4431) (thanks [@varphone](https://github.com/varphone)!) * Fix `Ui::scroll_with_delta` only scrolling if the `ScrollArea` is focused [#4303](emilk/egui#4303) (thanks [@lucasmerlin](https://github.com/lucasmerlin)!) * Add support for text truncation to `egui::Style` [#4556](emilk/egui#4556) (thanks [@abey79](https://github.com/abey79)!) * Hide toolip when opening `ComboBox` drop-down [#4546](emilk/egui#4546) (thanks [@abey79](https://github.com/abey79)!) * Better spacing and sizes for (menu) buttons [#4558](emilk/egui#4558) #### epaint * Add `RectShape::blur_width` to implement shadows [#4267](emilk/egui#4267) * Overload operators for `Rect + Margin`, `Rect - Margin` etc [#4277](emilk/egui#4277) * Fix incorrect line breaks [#4377](emilk/egui#4377) (thanks [@juancampa](https://github.com/juancampa)!) * Fix `hex_color!` macro by re-exporting `color_hex` crate from `ecolor` [#4372](emilk/egui#4372) (thanks [@dataphract](https://github.com/dataphract)!) * Add `emath::OrderedFloat` (moved from `epaint::util::OrderedFloat`) [#4389](emilk/egui#4389) * Added ability to define colors at UV coordinates along a path [#4353](emilk/egui#4353) (thanks [@murl-digital](https://github.com/murl-digital)!) * Add a `Display` impl for `Vec2`, `Pos2`, and `Rect` [#4428](emilk/egui#4428) (thanks [@tgross35](https://github.com/tgross35)!) * Remove `extra_asserts` and `extra_debug_asserts` feature flags [#4478](emilk/egui#4478) * Make `epaint::mutex::RwLock` allow `?Sized` types [#4485](emilk/egui#4485) (thanks [@crumblingstatue](https://github.com/crumblingstatue)!) * Update ahash 0.8.6 -> 0.8.11 [#4507](emilk/egui#4507) (thanks [@hellodword](https://github.com/hellodword)!) * Don't panic when replacement glyph is not found [#4542](emilk/egui#4542) (thanks [@RyanBluth](https://github.com/RyanBluth)!) --------- Co-authored-by: Antoine Beyeler <[email protected]> Co-authored-by: Andreas Reich <[email protected]>
1 parent aaef0b7 commit f8d5d4c

File tree

39 files changed

+333
-322
lines changed

39 files changed

+333
-322
lines changed

Cargo.lock

Lines changed: 245 additions & 184 deletions
Large diffs are not rendered by default.

Cargo.toml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,11 @@ eframe = { version = "0.27.2", default-features = false, features = [
9191
] }
9292
egui = { version = "0.27.2", features = [
9393
"callstack",
94-
"extra_debug_asserts",
9594
"log",
9695
"puffin",
9796
"rayon",
9897
] }
99-
egui_commonmark = { version = "0.15", default-features = false }
98+
egui_commonmark = { version = "0.16", default-features = false }
10099
egui_extras = { version = "0.27.2", features = ["http", "image", "puffin"] }
101100
egui_plot = "0.27.2"
102101
egui_tiles = "0.8.0"
@@ -145,13 +144,13 @@ glam = "0.22" # glam update blocked by macaw
145144
glob = "0.3"
146145
gltf = "1.1"
147146
half = "2.3.1"
148-
image = { version = "0.24", default-features = false }
147+
image = { version = "0.25", default-features = false }
149148
indent = "0.1"
150149
indexmap = "2.1" # Version chosen to align with other dependencies
151150
indicatif = "0.17.7" # Progress bar
152151
infer = "0.15" # infer MIME type by checking the magic number signaturefer MIME type by checking the magic number signature
153152
insta = "1.23"
154-
itertools = "0.12" # updating itertools is blocked on the next egui_tiles update
153+
itertools = "0.13"
155154
js-sys = "0.3"
156155
libc = "0.2"
157156
linked-hash-map = { version = "0.5", default-features = false }
@@ -239,7 +238,7 @@ wasm-bindgen-cli-support = "0.2.89"
239238
wasm-bindgen-futures = "0.4.33"
240239
web-sys = "0.3"
241240
web-time = "0.2.0"
242-
webbrowser = "0.8"
241+
webbrowser = "1.0"
243242
winit = { version = "0.29.9", default-features = false }
244243
# TODO(andreas): Try to get rid of `fragile-send-sync-non-atomic-wasm`. This requires re_renderer being aware of single-thread restriction on resources.
245244
# See also https://gpuweb.github.io/gpuweb/explainer/#multithreading-transfer (unsolved part of the Spec as of writing!)
@@ -260,8 +259,6 @@ wgpu = { version = "0.19.4", default-features = false, features = [
260259
wgpu-core = "0.19.4"
261260
xshell = "0.2"
262261
zip = { version = "0.6", default-features = false }
263-
zune-core = "0.4"
264-
zune-jpeg = "0.4"
265262

266263

267264
[profile.dev]
@@ -455,13 +452,13 @@ missing_errors_doc = "allow"
455452
# As a last resport, patch with a commit to our own repository.
456453
# ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.
457454

458-
# ecolor = { git = "https://github.com/emilk/egui.git", rev = "8a10f81ca01b2ba4e0bd6e08d02fdd2063f1ddcc" } # egui master 2024-03-26
459-
# eframe = { git = "https://github.com/emilk/egui.git", rev = "8a10f81ca01b2ba4e0bd6e08d02fdd2063f1ddcc" } # egui master 2024-03-26
460-
# egui = { git = "https://github.com/emilk/egui.git", rev = "8a10f81ca01b2ba4e0bd6e08d02fdd2063f1ddcc" } # egui master 2024-03-26
461-
# egui_extras = { git = "https://github.com/emilk/egui.git", rev = "8a10f81ca01b2ba4e0bd6e08d02fdd2063f1ddcc" } # egui master 2024-03-26
462-
# egui_plot = { git = "https://github.com/emilk/egui.git", rev = "8a10f81ca01b2ba4e0bd6e08d02fdd2063f1ddcc" } # egui master 2024-03-26
463-
# egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "8a10f81ca01b2ba4e0bd6e08d02fdd2063f1ddcc" } # egui master 2024-03-26
464-
# emath = { git = "https://github.com/emilk/egui.git", rev = "8a10f81ca01b2ba4e0bd6e08d02fdd2063f1ddcc" } # egui master 2024-03-26
455+
ecolor = { git = "https://github.com/emilk/egui.git", rev = "54429e0549e829c64b8de1b66f846fdf1a7ee37c" } # egui master 2024-05-28
456+
eframe = { git = "https://github.com/emilk/egui.git", rev = "54429e0549e829c64b8de1b66f846fdf1a7ee37c" } # egui master 2024-05-28
457+
egui = { git = "https://github.com/emilk/egui.git", rev = "54429e0549e829c64b8de1b66f846fdf1a7ee37c" } # egui master 2024-05-28
458+
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "54429e0549e829c64b8de1b66f846fdf1a7ee37c" } # egui master 2024-05-28
459+
egui_plot = { git = "https://github.com/emilk/egui.git", rev = "54429e0549e829c64b8de1b66f846fdf1a7ee37c" } # egui master 2024-05-28
460+
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "54429e0549e829c64b8de1b66f846fdf1a7ee37c" } # egui master 2024-05-28
461+
emath = { git = "https://github.com/emilk/egui.git", rev = "54429e0549e829c64b8de1b66f846fdf1a7ee37c" } # egui master 2024-05-28
465462

466463
# Useful while developing:
467464
# ecolor = { path = "../../egui/crates/ecolor" }
@@ -472,6 +469,6 @@ missing_errors_doc = "allow"
472469
# egui-wgpu = { path = "../../egui/crates/egui-wgpu" }
473470
# emath = { path = "../../egui/crates/emath" }
474471

475-
# egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "5245a28df8a3a5befd0c55085de4f7044a6d831e" } # main 2024-02-27, which works with egui master
472+
egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "7a9ef17dd873efc2c803a0a91a64246ab1a2fa83" } # main 2024-05-28, which works with egui master
476473

477-
# egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark", rev = "3d83a92f995a1d18ab1172d0b129d496e0eedaae" } # Update to egui 0.25 https://github.com/lampsitter/egui_commonmark/pull/27
474+
egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark", rev = "1c08d5ea58d60c6a61487b5eecefdfdb35c47036" } # https://github.com/lampsitter/egui_commonmark/pull/51

crates/re_data_ui/src/item_ui.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ pub fn component_path_button_to(
411411
let response = response.on_hover_ui(|ui| {
412412
// TODO(egui#4471): better tooltip size management
413413
ui.set_max_width(250.0);
414-
ui.style_mut().wrap = Some(false);
414+
ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
415415

416416
// wrap lone item
417417
list_item::list_item_scope(ui, "component_path_tooltip", |ui| {

crates/re_data_ui/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ pub fn label_for_ui_layout(
220220
let mut label = egui::Label::new(text);
221221

222222
match ui_layout {
223-
UiLayout::List => label = label.truncate(true),
223+
UiLayout::List => label = label.truncate(),
224224
UiLayout::Tooltip | UiLayout::SelectionPanelLimitHeight | UiLayout::SelectionPanelFull => {
225-
label = label.wrap(true);
225+
label = label.wrap();
226226
}
227227
}
228228

crates/re_edit_ui/src/corner2d.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn edit_corner2d(
2525
egui::ComboBox::from_id_source("corner2d")
2626
.selected_text(format!("{corner}"))
2727
.show_ui(ui, |ui| {
28-
ui.style_mut().wrap = Some(false);
28+
ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
2929
ui.set_min_width(64.0);
3030

3131
ui.selectable_value(

crates/re_edit_ui/src/lib.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ fn edit_scatter_ui(
172172
egui::ComboBox::from_id_source("scatter")
173173
.selected_text(scattered_text)
174174
.show_ui(ui, |ui| {
175-
ui.style_mut().wrap = Some(false);
175+
ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
176176
ui.selectable_value(&mut edit_scatter, false, "Line");
177177
ui.selectable_value(&mut edit_scatter, true, "Scattered");
178178
});
@@ -277,11 +277,7 @@ fn edit_marker_shape_ui(
277277
// workaround to force `ui.max_rect()` to reflect the content size
278278
ui.set_width(item_width);
279279

280-
let background_x_range = ui
281-
.spacing()
282-
.menu_margin
283-
.expand_rect(ui.max_rect())
284-
.x_range();
280+
let background_x_range = (ui.max_rect() + ui.spacing().menu_margin).x_range();
285281

286282
let list_ui = |ui: &mut egui::Ui| {
287283
for marker in MarkerShape::ALL {

crates/re_log/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ pub mod external {
5151

5252
/// Never log anything less serious than a `ERROR` from these crates.
5353
const CRATES_AT_ERROR_LEVEL: &[&str] = &[
54-
// Waiting for https://github.com/etemesi254/zune-image/issues/131 to be released
55-
"zune_jpeg",
5654
// silence rustls in release mode: https://github.com/rerun-io/rerun/issues/3104
5755
#[cfg(not(debug_assertions))]
5856
"rustls",

crates/re_selection_panel/src/override_ui.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ pub fn add_new_override(
193193
let menu = ui
194194
.menu_button("Add", |ui| {
195195
opened = true;
196-
ui.style_mut().wrap = Some(false);
196+
ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
197197

198198
// Present the option to add new components for each component that doesn't
199199
// already have an active override.
@@ -410,7 +410,7 @@ pub fn add_new_visualizer(
410410
ui.add_enabled_ui(enabled, |ui| {
411411
let menu = ui
412412
.menu_button("Add", |ui| {
413-
ui.style_mut().wrap = Some(false);
413+
ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
414414
opened = true;
415415

416416
if visualizer_options.is_empty() {

crates/re_selection_panel/src/selection_panel.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ fn container_top_level_properties(
964964
egui::ComboBox::from_id_source("container_grid_columns")
965965
.selected_text(columns_to_string(&new_columns))
966966
.show_ui(ui, |ui| {
967-
ui.style_mut().wrap = Some(false);
967+
ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
968968
ui.set_min_width(64.0);
969969

970970
ui.selectable_value(&mut new_columns, None, columns_to_string(&None));
@@ -1043,7 +1043,7 @@ fn container_kind_selection_ui(
10431043
let selected_text = format!("{in_out_kind:?}");
10441044

10451045
re_ui::drop_down_menu(ui, "container_kind", min_width, selected_text, |ui| {
1046-
ui.style_mut().wrap = Some(false);
1046+
ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
10471047

10481048
static_assertions::const_assert_eq!(ContainerKind::ALL.len(), 4);
10491049
for (kind, icon) in [

crates/re_space_view_bar_chart/src/space_view_class.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl SpaceViewClass for BarChartSpaceView {
131131
egui::ComboBox::from_id_source("legend_corner")
132132
.selected_text(corner.to_string())
133133
.show_ui(ui, |ui| {
134-
ui.style_mut().wrap = Some(false);
134+
ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
135135
ui.set_min_width(64.0);
136136

137137
ui.selectable_value(

0 commit comments

Comments
 (0)