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.

Sign up for GitHub

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

Jump to bottom

Bump iced 0.7. #52

Merged
merged 1 commit into from
Jan 17, 2023
Merged

Bump iced 0.7. #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 48 additions & 115 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ debug = ["iced/debug"]
grin-gui-core = { version = "0.1.0", path = "crates/core", features=['gui'] }
grin-gui-widgets = { version = "0.1.0", path = "crates/widgets" }

iced = { version = "0.6", features = ["canvas", "tokio", "default_system_font"] }
iced = { version = "0.7.0", features = ["canvas", "tokio", "default_system_font"] }
iced_futures = { version = "0.5", features = ["async-std"] }
iced_style = {version = "0.5"}
iced_native = { version = "0.7" }
#iced_aw = { version = "0.2.0", default-features = false, features = ["card", "modal"]}
iced_aw = { git = "https://github.com/yeastplume/iced_aw", branch = "iced_0_6_update"}
plotters-iced = "0.5"
iced_style = {version = "0.6.0"}
iced_native = { version = "0.8.0" }
iced_aw = { git = "https://github.com/iced-rs/iced_aw.git" }
plotters-iced = "0.6.0"
plotters="0.3"
plotters-backend = "0.3"
rand = "0.8.3"
Expand Down
16 changes: 8 additions & 8 deletions crates/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@ log4rs = { version = "0.12", features = [
backtrace = "0.3"
lazy_static = "1"

iced = { version = "0.6", default-features = false, features = ["default"] }
iced = { version = "0.7.0", default-features = false, features = ["default"] }
iced_futures = { version = "0.5", features = ["async-std"] }
iced_core = { version = "0.6" }
iced_style = "0.5"
iced_graphics = { version = "0.5.0" }
iced_native = { version = "0.7", optional = true }
iced_aw = { git = "https://github.com/yeastplume/iced_aw", branch = "iced_0_6_update" }
iced_core = { version = "0.7.0" }
iced_style = "0.6.0"
iced_graphics = { version = "0.6.0" }
iced_native = { version = "0.8.0", optional = true }
iced_aw = { git = "https://github.com/iced-rs/iced_aw.git" }

iced_wgpu = { version = "0.7", optional = true }
iced_glow = { version = "0.5", optional = true }
iced_wgpu = { version = "0.8.0", optional = true }
iced_glow = { version = "0.6.0", optional = true }

[dev-dependencies]
tempfile = "3.2.0"
Expand Down
5 changes: 4 additions & 1 deletion crates/core/src/theme/picklist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ impl pick_list::StyleSheet for Theme {
..self.palette.normal.primary
},
border_radius: 2.0,
icon_size: 0.5,
handle_color: Color {
a: 0.5,
..self.palette.normal.primary
},
placeholder_color: Color {
a: 0.5,
..self.palette.normal.primary
Expand Down
14 changes: 7 additions & 7 deletions crates/widgets/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ wgpu = ["iced_wgpu"]
opengl = ["iced_glow"]

[dependencies]
iced = { version = "0.6", default-features = false, features = ["default"] }
iced_native = { version = "0.7" }
iced_graphics = { version = "0.5.0" }
iced_core = { version = "0.6.1" }
iced_wgpu = { version = "0.6.1", optional = true }
iced_glow = { version = "0.4.1", optional = true }
iced_style = "0.5"
iced = { version = "0.7.0", default-features = false, features = ["default"] }
iced_native = { version = "0.8.0" }
iced_graphics = { version = "0.6.0" }
iced_core = { version = "0.7.0" }
iced_wgpu = { version = "0.8.0", optional = true }
iced_glow = { version = "0.6.0", optional = true }
iced_style = "0.6.0"
Loading