migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 22:00:03 -04:00
Code Activity

Fix some warnings

Browse Source
This commit is contained in:
Konkitoman
2023-08-14 17:59:26 +03:00
parent eccf90701f
commit 08f207a0a8
4 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,11 +3,10 @@
use std::{sync::Arc, time::Instant}; use std::{sync::Arc, time::Instant};
use egui::{epaint::ahash::HashMap, mutex::RwLock, ViewportBuilder, ViewportCommand, ViewportId}; use egui::{epaint::ahash::HashMap, mutex::RwLock, ViewportBuilder, ViewportId};
use raw_window_handle::{HasRawDisplayHandle as _, HasRawWindowHandle as _}; use raw_window_handle::{HasRawDisplayHandle as _, HasRawWindowHandle as _};
use winit::{ use winit::event_loop::{
event_loop::{ControlFlow, EventLoop, EventLoopBuilder, EventLoopProxy, EventLoopWindowTarget}, ControlFlow, EventLoop, EventLoopBuilder, EventLoopProxy, EventLoopWindowTarget,
window::WindowButtons,
}; };
#[cfg(feature = "accesskit")] #[cfg(feature = "accesskit")]
@@ -16,7 +15,7 @@ use egui_winit::winit;
use crate::{epi, Result}; use crate::{epi, Result};
use super::epi_integration::{self, load_icon, EpiIntegration}; use super::epi_integration::{self, EpiIntegration};
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -416,7 +415,7 @@ mod glow_integration {
}; };
use egui_winit::{ use egui_winit::{
changes_between_builders, create_winit_window_builder, process_viewport_commands, changes_between_builders, create_winit_window_builder, process_viewport_commands,
process_viewports_commands, EventResponse, EventResponse,
}; };
use glutin::{ use glutin::{
display::GetGlDisplay, display::GetGlDisplay,

51
crates/egui-winit/src/lib.rs
View File

@@ -953,17 +953,16 @@ pub fn process_viewport_commands(
ViewportCommand::Transparent(v) => win.set_transparent(v), ViewportCommand::Transparent(v) => win.set_transparent(v),
ViewportCommand::Visible(v) => win.set_visible(v), ViewportCommand::Visible(v) => win.set_visible(v),
ViewportCommand::OuterPosition(x, y) => { ViewportCommand::OuterPosition(x, y) => {
win.set_outer_position(LogicalPosition::new(x, y)) win.set_outer_position(LogicalPosition::new(x, y));
} }
ViewportCommand::InnerSize(w, h) => win.set_inner_size(LogicalSize::new(w, h)),
ViewportCommand::MinInnerSize(s) => { ViewportCommand::MinInnerSize(s) => {
win.set_min_inner_size(s.map(|s| LogicalSize::new(s.0, s.1))) win.set_min_inner_size(s.map(|s| LogicalSize::new(s.0, s.1)));
} }
ViewportCommand::MaxInnerSize(s) => { ViewportCommand::MaxInnerSize(s) => {
win.set_max_inner_size(s.map(|s| LogicalSize::new(s.0, s.1))) win.set_max_inner_size(s.map(|s| LogicalSize::new(s.0, s.1)));
} }
ViewportCommand::ResizeIncrements(s) => { ViewportCommand::ResizeIncrements(s) => {
win.set_resize_increments(s.map(|s| LogicalSize::new(s.0, s.1))) win.set_resize_increments(s.map(|s| LogicalSize::new(s.0, s.1)));
} }
ViewportCommand::Resizable(v) => win.set_resizable(v), ViewportCommand::Resizable(v) => win.set_resizable(v),
ViewportCommand::EnableButtons { ViewportCommand::EnableButtons {
@@ -971,20 +970,24 @@ pub fn process_viewport_commands(
mimimize, mimimize,
maximize, maximize,
} => win.set_enabled_buttons( } => win.set_enabled_buttons(
close if close {
.then_some(WindowButtons::CLOSE) WindowButtons::CLOSE
.unwrap_or(WindowButtons::empty()) } else {
| mimimize WindowButtons::empty()
.then_some(WindowButtons::MINIMIZE) } | if mimimize {
.unwrap_or(WindowButtons::empty()) WindowButtons::MINIMIZE
| maximize } else {
.then_some(WindowButtons::MAXIMIZE) WindowButtons::empty()
.unwrap_or(WindowButtons::empty()), } | if maximize {
WindowButtons::MAXIMIZE
} else {
WindowButtons::empty()
},
), ),
ViewportCommand::Minimized(v) => win.set_minimized(v), ViewportCommand::Minimized(v) => win.set_minimized(v),
ViewportCommand::Maximized(v) => win.set_maximized(v), ViewportCommand::Maximized(v) => win.set_maximized(v),
ViewportCommand::Fullscreen(v) => { ViewportCommand::Fullscreen(v) => {
win.set_fullscreen(v.then_some(winit::window::Fullscreen::Borderless(None))) win.set_fullscreen(v.then_some(winit::window::Fullscreen::Borderless(None)));
} }
ViewportCommand::Decorations(v) => win.set_decorations(v), ViewportCommand::Decorations(v) => win.set_decorations(v),
ViewportCommand::WindowLevel(o) => win.set_window_level(match o { ViewportCommand::WindowLevel(o) => win.set_window_level(match o {
@@ -996,7 +999,7 @@ pub fn process_viewport_commands(
win.set_window_icon(icon.map(|(bytes, width, height)| { win.set_window_icon(icon.map(|(bytes, width, height)| {
winit::window::Icon::from_rgba(bytes, width, height) winit::window::Icon::from_rgba(bytes, width, height)
.expect("Invalid ICON data!") .expect("Invalid ICON data!")
})) }));
} }
ViewportCommand::IMEPossition(x, y) => win.set_ime_position(LogicalPosition::new(x, y)), ViewportCommand::IMEPossition(x, y) => win.set_ime_position(LogicalPosition::new(x, y)),
ViewportCommand::IMEAllowed(v) => win.set_ime_allowed(v), ViewportCommand::IMEAllowed(v) => win.set_ime_allowed(v),
@@ -1047,7 +1050,7 @@ pub fn process_viewports_commands(
) { ) {
for (viewport_id, command) in commands { for (viewport_id, command) in commands {
if let Some(window) = get_window(viewport_id) { if let Some(window) = get_window(viewport_id) {
process_viewport_commands(vec![command], viewport_id, focused, window) process_viewport_commands(vec![command], viewport_id, focused, window);
} }
} }
} }
@@ -1064,24 +1067,20 @@ pub fn create_winit_window_builder(builder: &ViewportBuilder) -> winit::window::
.with_fullscreen( .with_fullscreen(
builder builder
.fullscreen .fullscreen
.map(|e| e.then(|| winit::window::Fullscreen::Borderless(None))) .and_then(|e| e.then_some(winit::window::Fullscreen::Borderless(None))),
.flatten(),
) )
.with_enabled_buttons( .with_enabled_buttons(
builder builder
.minimize_button .minimize_button
.map(|v| v.then(|| WindowButtons::MINIMIZE)) .and_then(|v| v.then_some(WindowButtons::MINIMIZE))
.flatten()
.unwrap_or(WindowButtons::empty()) .unwrap_or(WindowButtons::empty())
| builder | builder
.maximize_button .maximize_button
.map(|v| v.then(|| WindowButtons::MAXIMIZE)) .and_then(|v| v.then_some(WindowButtons::MAXIMIZE))
.flatten()
.unwrap_or(WindowButtons::empty()) .unwrap_or(WindowButtons::empty())
| builder | builder
.close_button .close_button
.map(|v| v.then(|| WindowButtons::CLOSE)) .and_then(|v| v.then_some(WindowButtons::CLOSE))
.flatten()
.unwrap_or(WindowButtons::empty()), .unwrap_or(WindowButtons::empty()),
) )
.with_active(builder.active.map_or(false, |e| e)); .with_active(builder.active.map_or(false, |e| e));
@@ -1318,5 +1317,5 @@ macro_rules! profile_scope {
pub(crate) use profile_scope; pub(crate) use profile_scope;
use winit::{ use winit::{
dpi::{LogicalPosition, LogicalSize}, dpi::{LogicalPosition, LogicalSize},
window::{CursorGrabMode, UserAttentionType, WindowButtons, WindowLevel}, window::{CursorGrabMode, WindowButtons, WindowLevel},
}; };

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

@@ -2191,7 +2191,7 @@ impl Context {
/// ///
/// When a viewport sync is created will be rendered by this function /// When a viewport sync is created will be rendered by this function
/// ///
/// Look in `crates/eframe/native/run.rs` and search for set_render_sync_callback to see for what is used! /// Look in `crates/eframe/native/run.rs` and search for ``set_render_sync_callback`` to see for what is used!
pub fn set_render_sync_callback( pub fn set_render_sync_callback(
&self, &self,
callback: impl for<'a> Fn(ViewportBuilder, ViewportId, ViewportId, Box<dyn FnOnce(&Context) + 'a>) callback: impl for<'a> Fn(ViewportBuilder, ViewportId, ViewportId, Box<dyn FnOnce(&Context) + 'a>)
@@ -2221,7 +2221,7 @@ impl Context {
} }
/// With this you can create a viewport "is a native window" /// With this you can create a viewport "is a native window"
/// You will need to wrap your viwport state in an RwLock or Mutex! /// You will need to wrap your viwport state in an ``RwLock`` or ``Mutex``!
/// When this is called again with the same title in `ViewportBuilder` the render function for that viewport will be updated! /// When this is called again with the same title in `ViewportBuilder` the render function for that viewport will be updated!
/// The render function will be called when the viewport receives a event or is requested to be redraw /// The render function will be called when the viewport receives a event or is requested to be redraw
/// ///

6
examples/viewports/src/main.rs
View File

@@ -50,7 +50,7 @@ impl eframe::App for App {
{ {
let mut desktop = ctx.is_desktop(); let mut desktop = ctx.is_desktop();
ui.checkbox(&mut desktop, "Desktop"); ui.checkbox(&mut desktop, "Desktop");
ctx.set_desktop(desktop) ctx.set_desktop(desktop);
} }
ui.checkbox(&mut self.show_async_viewport, "Show Async Viewport"); ui.checkbox(&mut self.show_async_viewport, "Show Async Viewport");
ui.checkbox(&mut self.show_sync_viewport, "Show Sync Viewport"); ui.checkbox(&mut self.show_sync_viewport, "Show Sync Viewport");
@@ -80,7 +80,7 @@ impl eframe::App for App {
} }
}); });
}, },
) );
} }
// Showing Sync Viewport // Showing Sync Viewport
@@ -159,7 +159,7 @@ fn main() {
"Viewports", "Viewports",
NativeOptions { NativeOptions {
renderer: RENDERER, renderer: RENDERER,
initial_window_size: Some(egui::Vec2::new(400.0, 200.0)), initial_window_size: Some(egui::Vec2::new(400.0, 220.0)),
..NativeOptions::default() ..NativeOptions::default()
}, },
Box::new(|_| Box::new(App::default())), Box::new(|_| Box::new(App::default())),