Fix iOS support in eframe
#3241
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emilk
reviewed
Aug 12, 2023
crates/eframe/src/native/run.rs
Outdated
| @@ -280,6 +281,10 @@ fn run_and_exit(event_loop: EventLoop<UserEvent>, mut winit_app: impl WinitApp + | |||
| } | |||
|
|
|||
| winit::event::Event::UserEvent(UserEvent::RequestRepaint { when, frame_nr }) => { | |||
| // WaitUntil seems to not work on iOS | |||
| #[cfg(target_os = "ios")] | |||
| winit_app.window().unwrap().request_redraw(); | |||
There was a problem hiding this comment.
I think it makes more sense to move this to line 340 (covers more cases)
There was a problem hiding this comment.
Good point, I've updated it
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows egui and eframe to work correctly on iOS.
Without these changes it wouldn't compile because winit doesn't support run_and_return on iOS.
Also request_redraw was not working, seems like WaitUntil was not working correctly, I'm not sure why though. My fix is to repaint immideately but that might need to be investigated some more.
Then, after changing screen orientation, the screen wouldn't return to full size, because egui was trying to restore the previous window size. I've disabled this behaviour for iOS since it doesn't seem like it would make sense there anyways.