Skip to content

Commit

Permalink
Update to latest iced (2/2)
Browse files Browse the repository at this point in the history
  • Loading branch information
m00nwtchr committed Jul 27, 2024
1 parent b1ec180 commit 705869e
Show file tree
Hide file tree
Showing 15 changed files with 344 additions and 373 deletions.
95 changes: 48 additions & 47 deletions Cargo.lock

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

22 changes: 4 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,40 +33,26 @@ inherits = "test"

[dependencies]
iced = { version = "0.12", features = ["lazy", "advanced"] }
#iced_lazy = "0.6"
#iced_native = "0.10"

# iced_style = "0.5"
# iced = { git = "https://github.com/iced-rs/iced" }
# iced_lazy = { git = "https://github.com/iced-rs/iced" }
# iced_native = { git = "https://github.com/iced-rs/iced" }
# iced_aw = {version = "0.2", default-features = false, features = ["pure", "tabs"]}
# iced_aw = {git = "https://github.com/iced-rs/iced_aw", features = ["pure", "tabs"]}
# iced_aw = { git = "https://github.com/genusistimelord/iced_aw", features = ["tabs"] }
log = "0.4"

cofd = { git = "https://github.com/m00nwtchr/cofd.git" }
codex-scraper = { git = "https://github.com/m00nwtchr/cofd-miner.git" }

closure = "0.3"
lazy_static = "1"
cfg-if = "1"
itertools = "0.13"
once_cell = "1.4"
anyhow = "1"
log = "0.4"

ron = "0.9.0-alpha.0"
serde = "1"

itertools = "0.13"


i18n-embed = { version = "0.14", features = ["fluent-system"] }
i18n-embed-fl = "0.8"
rust-embed = "8"
unic-langid = { version = "0.9", features = ["macros"] }

once_cell = "1.4"

anyhow = "1"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
i18n-embed = { version = "0.14", features = ["desktop-requester"] }
env_logger = "0.11"
Expand Down
15 changes: 8 additions & 7 deletions src/component/attributes.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
use std::{cell::RefCell, rc::Rc};

use crate::widget::dots;
use crate::{
fl,
i18n::flt,
widget::dots::{Shape, SheetDots},
Element, H2_SIZE, TITLE_SPACING,
};
use cofd::{
character::{
modifier::ModifierTarget,
Expand All @@ -20,6 +13,14 @@ use iced::{
Alignment, Length,
};

use crate::widget::dots;
use crate::{
fl,
i18n::flt,
widget::dots::{Shape, SheetDots},
Element, H2_SIZE, TITLE_SPACING,
};

pub struct AttributeBar<Message> {
// attributes: Attributes,
character: Rc<RefCell<Character>>,
Expand Down
Loading

0 comments on commit 705869e

Please sign in to comment.