migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

Fix dragging of custom_window_frame example on Windows (#4656)

Browse Source 
* Related #4592 
* Closes #4647 

Fix dragging of custom_window_frame on Windows (re-edited)
This commit is contained in:
rustbasic
2024-06-19 23:19:41 +09:00
committed by GitHub
parent 52a8e11764
commit d9c5fb04ae
5 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/eframe/src/native/glow_integration.rs
View File

@@ -1284,7 +1284,6 @@ impl GlutinWindowContext {
if let Some(window) = &viewport.window {
let old_inner_size = window.inner_size();
let is_viewport_focused = self.focused_viewport == Some(viewport_id);
viewport.deferred_commands.append(&mut commands);
egui_winit::process_viewport_commands(
@@ -1292,7 +1291,6 @@ impl GlutinWindowContext {
&mut viewport.info,
std::mem::take(&mut viewport.deferred_commands),
window,
is_viewport_focused,
&mut viewport.actions_requested,
);

8
crates/eframe/src/native/wgpu_integration.rs
View File

@@ -635,7 +635,7 @@ impl WgpuWinitRunning {
viewports,
painter,
viewport_from_window,
focused_viewport,
..
} = &mut *shared_mut;
let FullOutput {
@@ -724,7 +724,6 @@ impl WgpuWinitRunning {
viewports,
painter,
viewport_from_window,
*focused_viewport,
);
// Prune dead viewports:
@@ -996,7 +995,6 @@ fn render_immediate_viewport(
viewports,
painter,
viewport_from_window,
focused_viewport,
..
} = &mut *shared_mut;
@@ -1036,7 +1034,6 @@ fn render_immediate_viewport(
viewports,
painter,
viewport_from_window,
*focused_viewport,
);
}
@@ -1061,7 +1058,6 @@ fn handle_viewport_output(
viewports: &mut ViewportIdMap<Viewport>,
painter: &mut egui_wgpu::winit::Painter,
viewport_from_window: &mut HashMap<WindowId, ViewportId>,
focused_viewport: Option<ViewportId>,
) {
for (
viewport_id,
@@ -1083,7 +1079,6 @@ fn handle_viewport_output(
if let Some(window) = viewport.window.as_ref() {
let old_inner_size = window.inner_size();
let is_viewport_focused = focused_viewport == Some(viewport_id);
viewport.deferred_commands.append(&mut commands);
egui_winit::process_viewport_commands(
@@ -1091,7 +1086,6 @@ fn handle_viewport_output(
&mut viewport.info,
std::mem::take(&mut viewport.deferred_commands),
window,
is_viewport_focused,
&mut viewport.actions_requested,
);