Skip to content

servoshell: use accesskit exported from egui_winit and update egui crates#40010

Merged
mukilan merged 2 commits intomainfrom
egui-updates-and-accesskit-fix
Oct 20, 2025
Merged

servoshell: use accesskit exported from egui_winit and update egui crates#40010
mukilan merged 2 commits intomainfrom
egui-updates-and-accesskit-fix

Conversation

@mukilan
Copy link
Copy Markdown
Member

@mukilan mukilan commented Oct 20, 2025

Explicitly dependending on accesskit in servoshell requires the
version to be kept in sync with egui_winit, which easily breaks
dependabot upgrades.

Also adapt code to work with changes in egui-file-dialog API pulled in
by the dependabot upgrades in the parent commit.

Signed-off-by: Mukilan Thiyagarajan [email protected]

@mukilan mukilan requested a review from atbrakhi as a code owner October 20, 2025 07:23
@servo-highfive servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Oct 20, 2025
jdm
jdm approved these changes Oct 20, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@jdm jdm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, nice!

@servo-highfive servo-highfive removed the S-awaiting-review There is new code that needs to be reviewed. label Oct 20, 2025
@mukilan mukilan enabled auto-merge October 20, 2025 07:29
@mukilan mukilan force-pushed the egui-updates-and-accesskit-fix branch from 357d2fb to e161fbf Compare October 20, 2025 07:53
@servo-highfive servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Oct 20, 2025
@mukilan mukilan added this pull request to the merge queue Oct 20, 2025
@servo-highfive servo-highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Oct 20, 2025
@yezhizhen
Copy link
Copy Markdown
Member

yezhizhen commented Oct 20, 2025

Merge conflict with 3fd9ebb.

@yezhizhen yezhizhen removed this pull request from the merge queue due to a manual request Oct 20, 2025
@servo-highfive servo-highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Oct 20, 2025
dependabot bot and others added 2 commits October 20, 2025 14:24
@dependabot @mukilan
build(deps): bump the egui-related group with 8 updates
cb39c76 
Bumps the egui-related group with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [egui](https://github.com/emilk/egui) | `0.32.3` | `0.33.0` |
| [egui-file-dialog](https://github.com/jannistpl/egui-file-dialog) | `0.11.0` | `0.12.0` |
| [egui-winit](https://github.com/emilk/egui) | `0.32.3` | `0.33.0` |
| [egui_glow](https://github.com/emilk/egui) | `0.32.3` | `0.33.0` |
| [ecolor](https://github.com/emilk/egui) | `0.32.3` | `0.33.0` |
| [emath](https://github.com/emilk/egui) | `0.32.3` | `0.33.0` |
| [epaint](https://github.com/emilk/egui) | `0.32.3` | `0.33.0` |
| [epaint_default_fonts](https://github.com/emilk/egui) | `0.32.3` | `0.33.0` |


Updates `egui` from 0.32.3 to 0.33.0
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/main/CHANGELOG.md)
- [Commits](emilk/egui@0.32.3...0.33.0)

Updates `egui-file-dialog` from 0.11.0 to 0.12.0
- [Release notes](https://github.com/jannistpl/egui-file-dialog/releases)
- [Changelog](https://github.com/jannistpl/egui-file-dialog/blob/main/CHANGELOG.md)
- [Commits](jannistpl/egui-file-dialog@v0.11.0...v0.12.0)

Updates `egui-winit` from 0.32.3 to 0.33.0
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/main/CHANGELOG.md)
- [Commits](emilk/egui@0.32.3...0.33.0)

Updates `egui_glow` from 0.32.3 to 0.33.0
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/main/CHANGELOG.md)
- [Commits](emilk/egui@0.32.3...0.33.0)

Updates `ecolor` from 0.32.3 to 0.33.0
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/main/CHANGELOG.md)
- [Commits](emilk/egui@0.32.3...0.33.0)

Updates `emath` from 0.32.3 to 0.33.0
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/main/CHANGELOG.md)
- [Commits](emilk/egui@0.32.3...0.33.0)

Updates `epaint` from 0.32.3 to 0.33.0
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/main/CHANGELOG.md)
- [Commits](emilk/egui@0.32.3...0.33.0)

Updates `epaint_default_fonts` from 0.32.3 to 0.33.0
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/main/CHANGELOG.md)
- [Commits](emilk/egui@0.32.3...0.33.0)

---
updated-dependencies:
- dependency-name: egui
  dependency-version: 0.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: egui-related
- dependency-name: egui-file-dialog
  dependency-version: 0.12.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: egui-related
- dependency-name: egui-winit
  dependency-version: 0.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: egui-related
- dependency-name: egui_glow
  dependency-version: 0.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: egui-related
- dependency-name: ecolor
  dependency-version: 0.33.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: egui-related
- dependency-name: emath
  dependency-version: 0.33.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: egui-related
- dependency-name: epaint
  dependency-version: 0.33.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: egui-related
- dependency-name: epaint_default_fonts
  dependency-version: 0.33.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: egui-related
...

Signed-off-by: dependabot[bot] <[email protected]>
@mukilan
servoshell: use accesskit exported from egui_winit
ebf1b32 
Explicitly dependending on `accesskit` in servoshell requires the
version to be kept in sync with `egui_winit`, which easily breaks
dependabot upgrades.

Also adapt code to work with changes in `egui-file-dialog` API pulled in
by the dependabot upgrades in the parent commit.

Signed-off-by: Mukilan Thiyagarajan <[email protected]>
@mukilan mukilan force-pushed the egui-updates-and-accesskit-fix branch from e161fbf to ebf1b32 Compare October 20, 2025 08:59
@servo-highfive servo-highfive removed the S-needs-rebase There are merge conflict errors. label Oct 20, 2025
@mukilan mukilan enabled auto-merge October 20, 2025 09:05
@mukilan mukilan added this pull request to the merge queue Oct 20, 2025
@servo-highfive servo-highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Oct 20, 2025
@mukilan mukilan mentioned this pull request Oct 20, 2025
Closed
Merged via the queue into main with commit 961178b Oct 20, 2025
31 checks passed
@mukilan mukilan deleted the egui-updates-and-accesskit-fix branch October 20, 2025 10:15
@servo-highfive servo-highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Oct 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jdm jdm jdm approved these changes

@atbrakhi atbrakhi Awaiting requested review from atbrakhi atbrakhi is a code owner

Assignees

No one assigned

Labels

S-awaiting-review There is new code that needs to be reviewed.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mukilan @yezhizhen @jdm @servo-highfive