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

Merge branch 'master' of https://github.com/emilk/egui into multiples_viewports

Browse Source
This commit is contained in:
Konkitoman
2023-09-06 13:35:02 +03:00
parent 6e244d12cd ec671e754f
commit fea6ed7878
69 changed files with 1445 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/egui-winit/src/clipboard.rs
View File

@@ -26,10 +26,6 @@ pub struct Clipboard {
impl Clipboard {
/// Construct a new instance
///
/// # Safety
///
/// The returned `Clipboard` must not outlive the input `_display_target`.
pub fn new(_display_target: &dyn HasRawDisplayHandle) -> Self {
Self {
#[cfg(all(feature = "arboard", not(target_os = "android")))]

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

@@ -87,10 +87,6 @@ pub struct State {
impl State {
/// Construct a new instance
///
/// # Safety
///
/// The returned `State` must not outlive the input `display_target`.
pub fn new(display_target: &dyn HasRawDisplayHandle) -> Self {
let egui_input = egui::RawInput {
focused: false, // winit will tell us when we have focus

6
crates/egui-winit/src/window_settings.rs
View File

@@ -127,12 +127,10 @@ fn clamp_pos_to_monitors<E>(
let monitors = event_loop.available_monitors();
// default to primary monitor, in case the correct monitor was disconnected.
let mut active_monitor = if let Some(active_monitor) = event_loop
let Some(mut active_monitor) = event_loop
.primary_monitor()
.or_else(|| event_loop.available_monitors().next())
{
active_monitor
} else {
else {
return; // no monitors 🤷
};