Skip to content

Commit b1d72ba

Browse files
authored
Avoid irrelevant warning notifications in app kittest snapshot (#11354)
1 parent ef31741 commit b1d72ba

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

crates/viewer/re_ui/src/context_ext.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ pub trait ContextExt {
106106
let traffic_button_sizes_fallback = egui::vec2(64.0, 24.0); // source: I measured /emilk
107107

108108
#[cfg(target_os = "macos")]
109-
let native_buttons_size_in_native_scale = {
109+
let native_buttons_size_in_native_scale = if make_room_for_window_buttons {
110110
use crate::egui_ext::WindowChromeMetrics;
111111
use raw_window_handle::HasWindowHandle as _;
112112

@@ -125,6 +125,8 @@ pub trait ContextExt {
125125
}
126126
traffic_button_sizes_fallback
127127
}
128+
} else {
129+
egui::Vec2::ZERO
128130
};
129131
#[cfg(not(target_os = "macos"))]
130132
let native_buttons_size_in_native_scale = traffic_button_sizes_fallback;

crates/viewer/re_viewer/src/ui/top_panel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub fn top_panel(
2020
) {
2121
re_tracing::profile_function!();
2222

23-
let style_like_web = app.is_screenshotting();
23+
let style_like_web = app.is_screenshotting() || app.app_env().is_test();
2424
let top_bar_style = ui.ctx().top_bar_style(frame, style_like_web);
2525
let top_panel_frame = ui.tokens().top_panel_frame();
2626

crates/viewer/re_viewer/src/viewer_test_utils/mod.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ pub fn viewer_harness() -> Harness<'static, App> {
1818
MainThreadToken::i_promise_i_am_only_using_this_for_a_test(),
1919
build_info!(),
2020
AppEnvironment::Test,
21-
StartupOptions::default(),
21+
StartupOptions {
22+
// Don't calculate memory limit in tests.
23+
memory_limit: re_memory::MemoryLimit::UNLIMITED,
24+
..Default::default()
25+
},
2226
cc,
2327
None,
2428
AsyncRuntimeHandle::from_current_tokio_runtime_or_wasmbindgen()

0 commit comments

Comments
 (0)