Skip to content

Commit 11ac5fc

Browse files
committed
Cargo fmt
1 parent 70ffaeb commit 11ac5fc

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/sdl2_opengl.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ fn main() {
8282
let mut demo_ui = egui_demo_lib::DemoWindows::default();
8383

8484
'running: loop {
85-
8685
for event in event_pump.poll_iter() {
8786
match &event {
8887
Event::Quit { .. }
@@ -108,9 +107,10 @@ fn main() {
108107
egui_sdl2_state.sdl2_input_to_egui(&window, &event)
109108
}
110109

111-
let (_duration, full_output) = egui_skia.run(egui_sdl2_state.take_egui_input(&window), |ctx| {
112-
demo_ui.ui(ctx);
113-
});
110+
let (_duration, full_output) =
111+
egui_skia.run(egui_sdl2_state.take_egui_input(&window), |ctx| {
112+
demo_ui.ui(ctx);
113+
});
114114
egui_sdl2_state.process_output(&window, &full_output);
115115

116116
let canvas = surface.canvas();

examples/sdl2_vulkan.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use egui_sdl2_event::EguiSDL2State;
44
use sdl2::event::Event;
55
use sdl2::keyboard::Keycode;
66
use skia_safe::Color;
7-
use skulpin::{LogicalSize, RendererBuilder};
87
use skulpin::rafx::api::RafxExtents2D;
98
use skulpin::skia_safe;
9+
use skulpin::{LogicalSize, RendererBuilder};
1010

1111
use egui_skia::EguiSkia;
1212

@@ -72,8 +72,7 @@ fn main() {
7272

7373
let dpi = egui_sdl2_event::get_dpi(&window, &video_subsystem);
7474

75-
let mut egui_sdl2_state =
76-
EguiSDL2State::new(dpi);
75+
let mut egui_sdl2_state = EguiSDL2State::new(dpi);
7776
let mut egui_skia = EguiSkia::new();
7877

7978
let mut demo_ui = egui_demo_lib::DemoWindows::default();
@@ -93,9 +92,10 @@ fn main() {
9392
egui_sdl2_state.sdl2_input_to_egui(&window, &event)
9493
}
9594

96-
let (_duration, full_output) = egui_skia.run(egui_sdl2_state.take_egui_input(&window), |ctx| {
97-
demo_ui.ui(ctx);
98-
});
95+
let (_duration, full_output) =
96+
egui_skia.run(egui_sdl2_state.take_egui_input(&window), |ctx| {
97+
demo_ui.ui(ctx);
98+
});
9999
egui_sdl2_state.process_output(&window, &full_output);
100100

101101
let (window_width, window_height) = window.vulkan_drawable_size();
@@ -109,6 +109,5 @@ fn main() {
109109
egui_skia.paint(canvas);
110110
})
111111
.unwrap();
112-
113112
}
114113
}

src/egui_skia_winit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use std::time::Duration;
22

33
use egui::Context;
44
pub use egui_winit;
5-
use egui_winit::EventResponse;
65
use egui_winit::winit::event_loop::EventLoopWindowTarget;
76
use egui_winit::winit::window::Window;
7+
use egui_winit::EventResponse;
88
use skia_safe::Canvas;
99

1010
use crate::EguiSkia;

src/painter.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::sync::Arc;
33

44
use egui::epaint::ahash::AHashMap;
55
use egui::epaint::{Mesh16, Primitive};
6-
use egui::{ClippedPrimitive, ImageData, TextureFilter, TextureId, TexturesDelta};
6+
use egui::{ClippedPrimitive, ImageData, Pos2, TextureFilter, TextureId, TexturesDelta};
77
use skia_safe::vertices::VertexMode;
88
use skia_safe::wrapper::ValueWrapper;
99
use skia_safe::{
@@ -123,19 +123,21 @@ impl Painter {
123123
skia_safe::Matrix::scale((1.0 / image.width() as f32, 1.0 / image.height() as f32));
124124

125125
#[cfg(feature = "cpu_fix")]
126-
let sampling_options = skia_safe::SamplingOptions::new(skia_safe::FilterMode::Nearest, skia_safe::MipmapMode::None);
126+
let sampling_options = skia_safe::SamplingOptions::new(
127+
skia_safe::FilterMode::Nearest,
128+
skia_safe::MipmapMode::None,
129+
);
127130
#[cfg(not(feature = "cpu_fix"))]
128131
let sampling_options = {
129132
let filter_mode = match image_delta.options.magnification {
130133
TextureFilter::Nearest => skia_safe::FilterMode::Nearest,
131134
TextureFilter::Linear => skia_safe::FilterMode::Linear,
132135
};
133136
let mm_mode = match image_delta.options.minification {
134-
TextureFilter::Nearest => {skia_safe::MipmapMode::Nearest}
135-
TextureFilter::Linear => {skia_safe::MipmapMode::Linear}
137+
TextureFilter::Nearest => skia_safe::MipmapMode::Nearest,
138+
TextureFilter::Linear => skia_safe::MipmapMode::Linear,
136139
};
137-
let sampling_options =
138-
skia_safe::SamplingOptions::new(filter_mode, mm_mode);
140+
let sampling_options = skia_safe::SamplingOptions::new(filter_mode, mm_mode);
139141
sampling_options
140142
};
141143
let tile_mode = skia_safe::TileMode::Clamp;

0 commit comments

Comments
 (0)