3
4
Fork
You've already forked egui-baseview
3

WIP: Update to baseview 0.2 (pre-release for now) #31

Draft
prokopyl wants to merge 1 commit from prokopyl/egui-baseview:update-baseview-02 into main
pull from: prokopyl/egui-baseview:update-baseview-02
merge into: RustAudio:main
RustAudio:main
RustAudio:egui_31
RustAudio:egui_32
RustAudio:egui_33
First-time contributor
Copy link

This PR updates egui-baseview to the new and changed APIs in baseview v0.2.

(For now it isn't released on crates.io yet, I will mark this PR as ready to merge once it is, but this allows to use egui to test it and to see if changes need to be made until then. 🙂)

This PR updates `egui-baseview` to the new and changed APIs in `baseview` v0.2. (For now it isn't released on crates.io yet, I will mark this PR as ready to merge once it is, but this allows to use egui to test it and to see if changes need to be made until then. 🙂)
This pull request has changes conflicting with the target branch.
  • Cargo.toml
  • examples/hello_world.rs
  • examples/render_test.rs
  • examples/simple_demo.rs
  • src/renderer/opengl/renderer.rs
  • src/window.rs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u update-baseview-02:prokopyl-update-baseview-02
git switch prokopyl-update-baseview-02

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff prokopyl-update-baseview-02
git switch prokopyl-update-baseview-02
git rebase main
git switch main
git merge --ff-only prokopyl-update-baseview-02
git switch prokopyl-update-baseview-02
git rebase main
git switch main
git merge --no-ff prokopyl-update-baseview-02
git switch main
git merge --squash prokopyl-update-baseview-02
git switch main
git merge --ff-only prokopyl-update-baseview-02
git switch main
git merge prokopyl-update-baseview-02
git push origin main
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
RustAudio/egui-baseview!31
Reference in a new issue
RustAudio/egui-baseview
No description provided.
Delete branch "prokopyl/egui-baseview:update-baseview-02"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?