Merge remote-tracking branch 'upstream/main' into feature/grid-layout (542013bb) · Commits · Microhacks / Bevy Forks / Kayak UI 0.11 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kayak UI 0.11
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

542013bb

Commit 542013bb authored 2 years ago by Maccesch

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/main' into feature/grid-layout

parents 4aa58707 a046e334

No related branches found

No related tags found

No related merge requests found

Changes 89

Hide whitespace changes

Inline Side-by-side

Showing

src/widgets/nine_patch.rs 16 additions, 7 deletions

src/widgets/nine_patch.rs
src/widgets/scroll/scroll_bar.rs 24 additions, 19 deletions

src/widgets/scroll/scroll_bar.rs
src/widgets/scroll/scroll_box.rs 16 additions, 6 deletions

src/widgets/scroll/scroll_box.rs
src/widgets/scroll/scroll_content.rs 11 additions, 5 deletions

src/widgets/scroll/scroll_content.rs
src/widgets/scroll/scroll_context.rs 14 additions, 3 deletions

src/widgets/scroll/scroll_context.rs
src/widgets/text.rs 14 additions, 19 deletions

src/widgets/text.rs
src/widgets/text_box.rs 18 additions, 7 deletions

src/widgets/text_box.rs
src/widgets/texture_atlas.rs 13 additions, 8 deletions

src/widgets/texture_atlas.rs
src/widgets/window.rs 26 additions, 13 deletions

src/widgets/window.rs

with 152 additions and 87 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment