Skip to content

Commit

Permalink
update iced
Browse files Browse the repository at this point in the history
removes lots of stuff that is unused, as we don't plan on using cosmic-time long term
  • Loading branch information
wash2 committed Oct 18, 2024
1 parent 447ff6d commit 54110b6
Show file tree
Hide file tree
Showing 26 changed files with 94 additions and 4,217 deletions.
36 changes: 8 additions & 28 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,28 @@
name = "cosmic-time"
version = "0.4.0"
edition = "2021"
description = "An animation Crate for Iced and Cosmic DE"
description = "An animation Crate for libcosmic and Cosmic DE"
authors = ["Brock Szuszczewicz <brock@szu.email>"]
license = "MIT"
repository = "https://github.com/pop-os/cosmic-time"
documentation = "https://docs.rs/cosmic-time"
keywords = ["gui", "animation", "interface", "widgets", "iced"]
keywords = ["gui", "animation", "interface", "widgets", "libcosmic"]
categories = ["gui"]

[features]
default = ["iced"]
iced = [
"dep:iced",
"dep:iced_runtime",
"dep:iced_widget",
"dep:iced_futures",
"dep:iced_core",
"dep:iced_style",
]
once_cell = ["dep:once_cell"]
wayland-libcosmic = ["libcosmic", "libcosmic/wayland"]
winit-libcosmic = ["libcosmic", "libcosmic/winit"]
libcosmic = ["dep:libcosmic"]

[workspace]
members = ["examples/*"]
members = []

[dependencies]
iced = { git = "https://github.com/iced-rs/iced", rev = "5540ac0", features = [
libcosmic = { path = "../fork/libcosmic", default-features = false, features = [
"tokio",
], optional = true }
iced_runtime = { git = "https://github.com/iced-rs/iced", rev = "5540ac0", optional = true }
iced_widget = { git = "https://github.com/iced-rs/iced", rev = "5540ac0", optional = true }
iced_futures = { git = "https://github.com/iced-rs/iced", rev = "5540ac0", optional = true }
iced_core = { git = "https://github.com/iced-rs/iced", rev = "5540ac0", optional = true }
iced_style = { git = "https://github.com/iced-rs/iced", rev = "5540ac0", optional = true }
libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = [
"tokio",
], optional = true }
] }
once_cell = { version = "1.18.0", optional = true }
float-cmp = "0.9"

# [patch.'https://github.com/pop-os/libcosmic']
# libcosmic = { path = "../libcosmic" }
# cosmic-config = { path = "../libcosmic/cosmic-config" }
# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
# libcosmic = { path = "../fork/libcosmic" }
# cosmic-config = { path = "../fork/libcosmic/cosmic-config" }
# cosmic-theme = { path = "../fork/libcosmic/cosmic-theme" }
4 changes: 2 additions & 2 deletions examples/pong/src/layer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ where
state: &mut Tree,
layout: Layout<'_>,
renderer: &Renderer,
operation: &mut dyn widget::Operation<Message>,
operation: &mut dyn widget::Operation<()>,
) {
self.base
.as_widget()
Expand Down Expand Up @@ -236,7 +236,7 @@ where
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
operation: &mut dyn widget::Operation<Message>,
operation: &mut dyn widget::Operation<()>,
) {
self.content.as_widget().operate(
self.tree,
Expand Down
21 changes: 1 addition & 20 deletions src/keyframes.rs
Original file line number Diff line number Diff line change
@@ -1,33 +1,14 @@
mod button;
#[cfg(feature = "libcosmic")]
mod cards;
mod column;
mod container;
mod helpers;
mod row;
mod space;
mod style_button;
mod style_container;
mod toggler;

use crate::reexports::iced_core::{widget, Length};

pub use button::Button;
#[cfg(feature = "libcosmic")]
pub use cards::Cards;
pub use column::Column;
pub use container::Container;
#[cfg(feature = "libcosmic")]
pub use helpers::cards;
pub use helpers::id;
pub use helpers::lazy;
pub use helpers::{
button, chain, column, container, row, space, style_button, style_container, toggler,
};
pub use row::Row;
pub use space::Space;
pub use style_button::StyleButton;
pub use style_container::StyleContainer;
pub use helpers::{chain, toggler};
pub use toggler::Toggler;

use crate::Timeline;
Expand Down
212 changes: 0 additions & 212 deletions src/keyframes/button.rs

This file was deleted.

Loading

0 comments on commit 54110b6

Please sign in to comment.