Skip to content

Commit

Permalink
remove iced_dylib, minor style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
B0ney committed Apr 6, 2024
1 parent 7dbfe46 commit 3a3a075
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 168 deletions.
185 changes: 25 additions & 160 deletions Cargo.lock

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

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ audio = ["dep:audio_engine", "dep:dasp"]
wgpu = ["iced/wgpu"]
manual = ["data/manual"]
backtrace = []
dylib = ["iced/dynamic-linking"]

[workspace]
members = ["data", "audio_engine"]
Expand All @@ -33,7 +32,6 @@ features = ["serde"]
[workspace.dependencies.iced]
# version = "0.13.0"
git = "https://github.com/iced-rs/iced.git"
branch = "feature/dynamic-linking"
default-features = false
features = ["image", "tokio", "multi-window", "advanced", "canvas", "tiny-skia"]

Expand Down
2 changes: 1 addition & 1 deletion src/style/button.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub fn cancel(theme: &Theme, status: Status) -> Style {
},
Status::Hovered => Style {
background: Some(Color { a: 0.4, ..p.error }.into()),
text_color: p.error,
text_color: p.text,
border: border(Color { a: 0.5, ..p.error }),
..Default::default()
},
Expand Down
7 changes: 2 additions & 5 deletions src/style/checkbox.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use iced::border::{Border, Radius};
use iced::widget::checkbox::{Catalog, Status, Style, StyleFn};
use iced::{color, Color};

use super::helpers::border;
use super::{Theme, BORDER_RADIUS, BORDER_WIDTH};

impl Catalog for Theme {
Expand All @@ -23,11 +24,7 @@ pub fn entry(theme: &Theme, status: Status) -> Style {
Status::Active { .. } | Status::Disabled { .. } => Style {
background: p.middleground.into(),
icon_color: p.accent,
border: Border {
color: p.border,
width: BORDER_WIDTH,
radius: BORDER_RADIUS.into(),
},
border: border(p.border),
text_color: Some(p.text),
},
Status::Hovered { .. } => Style {
Expand Down

0 comments on commit 3a3a075

Please sign in to comment.