Include Cosmic theme in libcosmic, instead of in Iced fork
I think it's best to only include things in the Iced fork that can't be done without forking Iced, and/or are expected to be merged upstream. The theme doesn't seem to be either, so it fits more appropriately in libcosmic. That should make it easier to keep up with upstream, and it may help to have all the Cosmic parts in one place. Based on https://github.com/pop-os/iced commit ad9026e.
This commit is contained in:
parent
a6d93de47f
commit
947532413a
13 changed files with 1145 additions and 19 deletions
|
|
@ -1,4 +1,5 @@
|
|||
use crate::separator;
|
||||
use crate::theme::{self, Container};
|
||||
use derive_setters::Setters;
|
||||
use iced::mouse::Interaction;
|
||||
use iced::{overlay, Alignment, Length, Padding, Point, Rectangle};
|
||||
|
|
@ -12,8 +13,6 @@ use iced_native::{
|
|||
renderer, row, Background, Clipboard, Color, Element, Event, Layout, Shell, Widget,
|
||||
};
|
||||
use iced_style::container::{Appearance, StyleSheet};
|
||||
use iced_style::theme;
|
||||
use iced_style::theme::Container;
|
||||
|
||||
#[derive(Setters)]
|
||||
#[allow(dead_code)]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
pub use iced::{widget, Background, Color, Theme};
|
||||
pub use iced::{widget, Background, Color};
|
||||
pub use crate::Theme;
|
||||
|
||||
pub mod list_view {
|
||||
#[macro_export]
|
||||
|
|
@ -82,7 +83,7 @@ pub mod list_view {
|
|||
|
||||
use crate::widget::{Background, Color};
|
||||
use iced::widget;
|
||||
use iced_style::Theme;
|
||||
use crate::Theme;
|
||||
|
||||
pub use list_view;
|
||||
pub use list_view_item;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue