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

Fix pixels per point for multiples viewports

Browse Source 
Fix ./scripts/check.sh errors
This commit is contained in:
Konkitoman
2023-10-22 17:15:21 +03:00
parent b4224566ed
commit d6c2f3e8f3
12 changed files with 93 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/egui_demo_lib/benches/benchmark.rs
View File

@@ -1,6 +1,6 @@
use criterion::{criterion_group, criterion_main, Criterion};
use egui::{epaint::TextShape, ViewportIdPair};
use egui::{epaint::TextShape, ViewportId, ViewportIdPair};
use egui_demo_lib::LOREM_IPSUM_LONG;
pub fn criterion_benchmark(c: &mut Criterion) {
@@ -16,7 +16,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
let full_output = ctx.run(RawInput::default(), ViewportIdPair::MAIN, |ctx| {
demo_windows.ui(ctx);
});
ctx.tessellate(full_output.shapes)
ctx.tessellate(full_output.shapes, ViewportId::MAIN)
});
});
@@ -32,7 +32,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
demo_windows.ui(ctx);
});
c.bench_function("demo_only_tessellate", |b| {
b.iter(|| ctx.tessellate(full_output.shapes.clone()));
b.iter(|| ctx.tessellate(full_output.shapes.clone(), ViewportId::MAIN));
});
}

6
crates/egui_demo_lib/src/lib.rs
View File

@@ -19,7 +19,7 @@ pub mod easy_mark;
pub use color_test::ColorTest;
pub use demo::DemoWindows;
#[cfg(test)]
use egui::ViewportIdPair;
use egui::{ViewportId, ViewportIdPair};
/// View some Rust code with syntax highlighting and selection.
pub(crate) fn rust_view_ui(ui: &mut egui::Ui, code: &str) {
@@ -79,7 +79,7 @@ fn test_egui_e2e() {
let full_output = ctx.run(raw_input.clone(), ViewportIdPair::MAIN, |ctx| {
demo_windows.ui(ctx);
});
let clipped_primitives = ctx.tessellate(full_output.shapes);
let clipped_primitives = ctx.tessellate(full_output.shapes, ViewportId::MAIN);
assert!(!clipped_primitives.is_empty());
}
}
@@ -98,7 +98,7 @@ fn test_egui_zero_window_size() {
let full_output = ctx.run(raw_input.clone(), ViewportIdPair::MAIN, |ctx| {
demo_windows.ui(ctx);
});
let clipped_primitives = ctx.tessellate(full_output.shapes);
let clipped_primitives = ctx.tessellate(full_output.shapes, ViewportId::MAIN);
assert!(
clipped_primitives.is_empty(),
"There should be nothing to show, has at least one primitive with clip_rect: {:?}",