Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Final polish for new image loading #3328

Merged
merged 33 commits into from
Sep 13, 2023
Merged

Final polish for new image loading #3328

merged 33 commits into from
Sep 13, 2023

Conversation

jprochazk
Copy link
Collaborator

@jprochazk jprochazk commented Sep 12, 2023

Part of #3291

  • Add egui logo to demo widget gallery
  • Improve error message when no image loaders are installed
    image
  • Support Cow<'static, str> instead of only &'static str for ImageSource::Bytes URIs
  • Remove any remaining usage of RetainedImage
    • There is one #![allow(deprecated)] remaining in egui_extras::image itself.
  • Add #[doc(hidden)] to egui_extras::image
  • Replace RawImage in Button with just Image
  • Remove RawImage
  • Add a Style option for wether or not an image should show a spinner while loading (see Welcome + Examples screen design touch-ups rerun-io/rerun#3244)

@jprochazk jprochazk added egui_extras egui feature New feature or request labels Sep 12, 2023
@jprochazk jprochazk marked this pull request as ready for review September 13, 2023 08:46
@jprochazk jprochazk requested a review from emilk September 13, 2023 08:53
crates/egui/src/load.rs Outdated Show resolved Hide resolved
crates/egui/src/widgets/button.rs Outdated Show resolved Hide resolved
crates/egui/src/widgets/button.rs Outdated Show resolved Hide resolved
crates/egui/src/widgets/image.rs Outdated Show resolved Hide resolved
crates/egui/src/widgets/image.rs Outdated Show resolved Hide resolved
crates/egui/src/widgets/image.rs Outdated Show resolved Hide resolved
crates/egui_demo_lib/src/demo/widget_gallery.rs Outdated Show resolved Hide resolved
crates/egui_plot/src/items/mod.rs Outdated Show resolved Hide resolved
@emilk emilk merged commit 67a3fca into master Sep 13, 2023
@emilk emilk deleted the improved-texture-loading-p3 branch September 13, 2023 14:27
emilk added a commit to rerun-io/rerun that referenced this pull request Sep 13, 2023
<!--
Open the PR up as a draft until you feel it is ready for a proper
review.

Do not make PR:s from your own `main` branch, as that makes it difficult
for reviewers to add their own fixes.

Add any improvements to the branch as new commits to make it easier for
reviewers to follow the progress. All commits will be squashed to a
single commit once the PR is merged into `main`.

Make sure you mention any issues that this PR closes in the description,
as well as any other related issues.

To get an auto-generated PR description you can put "copilot:summary" or
"copilot:walkthrough" anywhere.
-->

### What

- Update `egui` to point to latest commit on
emilk/egui#3328
- Remove `StaticImageCache`, as its a part of `egui` now
- Update icons to use `egui::Image`

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/3311) (if
applicable)

- [PR Build Summary](https://build.rerun.io/pr/3311)
- [Docs
preview](https://rerun.io/preview/5fd7b59260f843d1f2fab710b8f719b368a3f039/docs)
<!--DOCS-PREVIEW-->
- [Examples
preview](https://rerun.io/preview/5fd7b59260f843d1f2fab710b8f719b368a3f039/examples)
<!--EXAMPLES-PREVIEW-->
- [Recent benchmark results](https://ref.rerun.io/dev/bench/)
- [Wasm size tracking](https://ref.rerun.io/dev/sizes/)

---------

Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
egui_extras egui feature New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants