Skip to content

Commit

Permalink
Merge pull request #52 from B0ney/theme-rewrite
Browse files Browse the repository at this point in the history
Theme rewrite
  • Loading branch information
B0ney authored Apr 6, 2024
2 parents d4b4665 + ebe1acc commit d221265
Show file tree
Hide file tree
Showing 26 changed files with 525 additions and 1,017 deletions.
208 changes: 24 additions & 184 deletions Cargo.lock

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

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "GPLv3"
repository = "https://github.com/B0ney/xmodits"

[features]
default = ["built", "manual"]
default = ["built", "manual", "audio"]
audio = ["dep:audio_engine", "dep:dasp"]
wgpu = ["iced/wgpu"]
manual = ["data/manual"]
Expand All @@ -32,13 +32,12 @@ features = ["serde"]
[workspace.dependencies.iced]
# version = "0.13.0"
git = "https://github.com/iced-rs/iced.git"
# rev = "9e3ad0e1e025232f93ef04bc79328c3444839a34" # 0.12.0
default-features = false
features = ["image", "tokio", "multi-window", "advanced", "canvas", "tiny-skia"]

[dependencies.iced_gif]
git = "https://github.com/B0ney/iced_gif.git"
branch = "iced_12"
branch = "iced_master"
optional = true

[dependencies.rfd]
Expand Down
2 changes: 0 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
#![allow(clippy::needless_lifetimes)]
#![allow(clippy::unused_variables)]
#![allow(unused_imports)]


Expand All @@ -16,7 +15,6 @@ pub mod screen;
pub mod style;
pub mod utils;
pub mod widget;
// pub mod style;

use app::XMODITS;
use cli::Mode;
Expand Down
3 changes: 1 addition & 2 deletions src/screen/entry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,7 @@ impl Entries {

fn view_entry((index, entry): (usize, &Entry)) -> Element<Message> {
let check = checkbox("", entry.selected)
.on_toggle(move |selected| Message::Select { index, selected })
.style(style::checkbox::entry);
.on_toggle(move |selected| Message::Select { index, selected });

let filename = text_adv(entry.filename());

Expand Down
Loading

0 comments on commit d221265

Please sign in to comment.