leyoda/libcosmic-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include Cosmic theme in libcosmic, instead of in Iced fork

Browse source 
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:
Ian Douglas Scott 2022-10-28 21:59:41 -07:00 • committed by Jeremy Soller
parent a6d93de47f
commit 947532413a
13 changed files with 1145 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/widget/navigation/macros.rs
View file

@ -1,5 +1,6 @@
pub mod nav_bar {
use iced::{widget, Background, Color, Theme};
use iced::{widget, Background, Color};
use crate::Theme;
#[macro_export]
macro_rules! nav_button {

3
src/widget/navigation/navbar.rs
View file

@ -1,13 +1,14 @@
use crate::scrollable;
use crate::widget::nav_bar::{nav_bar_pages_style, nav_bar_sections_style};
use crate::widget::{icon, Background};
use crate::{theme, Theme};
use derive_setters::Setters;
use iced::Length;
use iced_lazy::Component;
use iced_native::widget::{button, column, container, text};
use iced_native::{row, Alignment, Element};
use iced_style::button::Appearance;
use iced_style::{scrollable, theme, Theme};
use iced_style::scrollable;
use std::collections::BTreeMap;
#[derive(Setters, Default)]