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

winit: don't explicitly handle Cmd-Q and Alt-F4 (#881)

Browse Source 
Closes https://github.com/emilk/egui/issues/877

Still a problem: https://github.com/rust-windowing/winit/issues/1998
This commit is contained in:
Emil Ernerfeldt
2021-11-07 20:58:02 +01:00
committed by GitHub
parent 19d24bbebe
commit ddd5f6f4f6
12 changed files with 14 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
egui_glium/CHANGELOG.md
View File

@@ -4,6 +4,7 @@ All notable changes to the `egui_glium` integration will be noted in this file.
## Unreleased
* Simplify `EguiGlium` interface ([#871](https://github.com/emilk/egui/pull/871)).
* Remove `EguiGlium::is_quit_event` ([#881](https://github.com/emilk/egui/pull/881)).
## 0.15.0 - 2021-10-24

5
egui_glium/examples/native_texture.rs
View File

@@ -102,8 +102,9 @@ fn main() {
glutin::event::Event::RedrawRequested(_) if !cfg!(windows) => redraw(),
glutin::event::Event::WindowEvent { event, .. } => {
if egui_glium.is_quit_event(&event) {
*control_flow = glium::glutin::event_loop::ControlFlow::Exit;
use glutin::event::WindowEvent;
if matches!(event, WindowEvent::CloseRequested | WindowEvent::Destroyed) {
*control_flow = glutin::event_loop::ControlFlow::Exit;
}
egui_glium.on_event(&event);

5
egui_glium/examples/pure_glium.rs
View File

@@ -72,8 +72,9 @@ fn main() {
glutin::event::Event::RedrawRequested(_) if !cfg!(windows) => redraw(),
glutin::event::Event::WindowEvent { event, .. } => {
if egui_glium.is_quit_event(&event) {
*control_flow = glium::glutin::event_loop::ControlFlow::Exit;
use glutin::event::WindowEvent;
if matches!(event, WindowEvent::CloseRequested | WindowEvent::Destroyed) {
*control_flow = glutin::event_loop::ControlFlow::Exit;
}
egui_glium.on_event(&event);

3
egui_glium/src/epi_backend.rs
View File

@@ -1,7 +1,6 @@
use crate::*;
use egui::Color32;
#[cfg(target_os = "windows")]
use glium::glutin::platform::windows::WindowBuilderExtWindows;
use glium::glutin;
impl epi::TextureAllocator for Painter {
fn alloc_srgba_premultiplied(

7
egui_glium/src/lib.rs
View File

@@ -97,8 +97,6 @@ pub use epi_backend::{run, NativeOptions};
pub use egui_winit;
use glium::glutin;
// ----------------------------------------------------------------------------
/// Convenience wrapper for using [`egui`] from a [`glium`] app.
@@ -127,11 +125,6 @@ impl EguiGlium {
self.egui_winit.on_event(&self.egui_ctx, event)
}
/// Is this a close event or a Cmd-Q/Alt-F4 keyboard command?
pub fn is_quit_event(&self, event: &glutin::event::WindowEvent<'_>) -> bool {
self.egui_winit.is_quit_event(event)
}
/// Returns `needs_repaint` and shapes to draw.
pub fn run(
&mut self,