migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

egui, egui_glow, eframe: fix all errors returned by ./scripts/check.sh

Browse Source
This commit is contained in:
Konkitoman
2023-09-26 00:45:33 +03:00
parent 489d8a79c8
commit 543a0a2a83
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/eframe/src/native/run.rs
View File

@@ -673,7 +673,7 @@ mod glow_integration {
window: window.map(|w| Arc::new(RwLock::new(w))), window: window.map(|w| Arc::new(RwLock::new(w))),
egui_winit: None, egui_winit: None,
render: None, render: None,
pair: ViewportIdPair::MAIN pair: ViewportIdPair::MAIN,
})), })),
); );
@@ -1241,7 +1241,7 @@ mod glow_integration {
window: None, window: None,
egui_winit: None, egui_winit: None,
render, render,
pair pair,
})), })),
); );
glutin.builders.insert(pair.this, builder); glutin.builders.insert(pair.this, builder);
@@ -1353,7 +1353,12 @@ mod glow_integration {
let (integration, app, glutin, painter) = { let (integration, app, glutin, painter) = {
let running = self.running.read(); let running = self.running.read();
let running = running.as_ref().unwrap(); let running = running.as_ref().unwrap();
(running.integration.clone(), running.app.clone(), running.glutin_ctx.clone(), running.painter.clone()) (
running.integration.clone(),
running.app.clone(),
running.glutin_ctx.clone(),
running.painter.clone(),
)
}; };
// This will only happen if the viewport is sync // This will only happen if the viewport is sync
@@ -2131,7 +2136,7 @@ mod wgpu_integration {
viewport_builder.icon = builders.get(&parent_id).unwrap().icon.clone(); viewport_builder.icon = builders.get(&parent_id).unwrap().icon.clone();
} }
} }
let Window{window, state, ..} = _windows.entry(viewport_id).or_insert(Window{window: None, state: Arc::new(RwLock::new(None)), render: None, parent_id }); let Window{window, state, ..} = _windows.entry(viewport_id).or_insert(Window{window: None, state: Arc::new(RwLock::new(None)), render: None, parent_id });
let _ = c_builders.write().entry(viewport_id).or_insert(viewport_builder.clone()); let _ = c_builders.write().entry(viewport_id).or_insert(viewport_builder.clone());
@@ -2324,7 +2329,7 @@ mod wgpu_integration {
&window.read(), &window.read(),
state.write().as_mut().unwrap(), state.write().as_mut().unwrap(),
&render.clone(), &render.clone(),
ViewportIdPair::new(viewport_id, parent_id) ViewportIdPair::new(viewport_id, parent_id),
); );
integration.write().handle_platform_output( integration.write().handle_platform_output(

6
crates/egui/src/context.rs
View File

@@ -436,7 +436,7 @@ impl ContextImpl {
/// // Game loop: /// // Game loop:
/// loop { /// loop {
/// let raw_input = egui::RawInput::default(); /// let raw_input = egui::RawInput::default();
/// let full_output = ctx.run(raw_input, egui::ViewportId::MAIN, egui::ViewportId::MAIN, |ctx| { /// let full_output = ctx.run(raw_input, egui::ViewportIdPair::MAIN, |ctx| {
/// egui::CentralPanel::default().show(&ctx, |ui| { /// egui::CentralPanel::default().show(&ctx, |ui| {
/// ui.label("Hello world!"); /// ui.label("Hello world!");
/// if ui.button("Click me").clicked() { /// if ui.button("Click me").clicked() {
@@ -505,7 +505,7 @@ impl Context {
/// ///
/// // Each frame: /// // Each frame:
/// let input = egui::RawInput::default(); /// let input = egui::RawInput::default();
/// let full_output = ctx.run(input, egui::ViewportId::MAIN, egui::ViewportId::MAIN, |ctx| { /// let full_output = ctx.run(input, egui::ViewportIdPair::MAIN, |ctx| {
/// egui::CentralPanel::default().show(&ctx, |ui| { /// egui::CentralPanel::default().show(&ctx, |ui| {
/// ui.label("Hello egui!"); /// ui.label("Hello egui!");
/// }); /// });
@@ -534,7 +534,7 @@ impl Context {
/// ///
/// // Each frame: /// // Each frame:
/// let input = egui::RawInput::default(); /// let input = egui::RawInput::default();
/// ctx.begin_frame(input, egui::ViewportId::MAIN, egui::ViewportId::MAIN); /// ctx.begin_frame(input, egui::ViewportIdPair::MAIN);
/// ///
/// egui::CentralPanel::default().show(&ctx, |ui| { /// egui::CentralPanel::default().show(&ctx, |ui| {
/// ui.label("Hello egui!"); /// ui.label("Hello egui!");

2
crates/egui/src/lib.rs
View File

@@ -121,7 +121,7 @@
//! loop { //! loop {
//! let raw_input: egui::RawInput = gather_input(); //! let raw_input: egui::RawInput = gather_input();
//! //!
//! let full_output = ctx.run(raw_input, egui::ViewportId::MAIN, egui::ViewportId::MAIN, |ctx| { //! let full_output = ctx.run(raw_input, egui::ViewportIdPair::MAIN, |ctx| {
//! egui::CentralPanel::default().show(&ctx, |ui| { //! egui::CentralPanel::default().show(&ctx, |ui| {
//! ui.label("Hello world!"); //! ui.label("Hello world!");
//! if ui.button("Click me").clicked() { //! if ui.button("Click me").clicked() {

6
crates/egui_glow/src/winit.rs
View File

@@ -1,5 +1,5 @@
use crate::shader_version::ShaderVersion; use crate::shader_version::ShaderVersion;
use egui::ViewportId; use egui::ViewportIdPair;
pub use egui_winit; pub use egui_winit;
use egui_winit::winit; use egui_winit::winit;
pub use egui_winit::EventResponse; pub use egui_winit::EventResponse;
@@ -55,9 +55,7 @@ impl EguiGlow {
textures_delta, textures_delta,
shapes, shapes,
.. ..
} = self } = self.egui_ctx.run(raw_input, ViewportIdPair::MAIN, run_ui);
.egui_ctx
.run(raw_input, ViewportId::MAIN, ViewportId::MAIN, run_ui);
self.egui_winit self.egui_winit
.handle_platform_output(window, &self.egui_ctx, platform_output); .handle_platform_output(window, &self.egui_ctx, platform_output);