Allow optional overriding of panel (in panel layout) widget styles #9

Open

bu5hm4nn wants to merge 9 commits from bu5hm4nn/feature/allow-panel-visuals-override into gossip

bu5hm4nn commented

2023-10-10 08:42:57 +13:00

(Migrated from github.com)

Allow passing optional style::Widgets to panel builder to override specific panel style only.

Allow passing optional `style::Widgets` to panel builder to override specific panel style only.

This pull request has changes conflicting with the target branch.

Cargo.lock
crates/egui/src/containers/mod.rs
crates/egui/src/containers/scroll_area.rs
crates/egui/src/layout.rs
crates/egui/src/widgets/label.rs
crates/epaint/src/text/text_layout.rs
examples/wrapping-layout/src/main.rs

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Allow optional overriding of panel (in panel layout) widget styles' (#9) from bu5hm4nn/feature/allow-panel-visuals-override into gossip

Merge commit body

Reviewed-on: https://git.mikedilger.com/nostr/egui/pulls/9

Merge pull request 'Allow optional overriding of panel (in panel layout) widget styles' (#9) from bu5hm4nn/feature/allow-panel-visuals-override into gossip

Reviewed-on: https://git.mikedilger.com/nostr/egui/pulls/9

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin bu5hm4nn/feature/allow-panel-visuals-override:bu5hm4nn/feature/allow-panel-visuals-override

git switch bu5hm4nn/feature/allow-panel-visuals-override

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 gossip

git merge --no-ff bu5hm4nn/feature/allow-panel-visuals-override

git switch bu5hm4nn/feature/allow-panel-visuals-override

git rebase gossip

git switch gossip

git merge --ff-only bu5hm4nn/feature/allow-panel-visuals-override

git switch bu5hm4nn/feature/allow-panel-visuals-override

git rebase gossip

git switch gossip

git merge --no-ff bu5hm4nn/feature/allow-panel-visuals-override

git switch gossip

git merge --squash bu5hm4nn/feature/allow-panel-visuals-override