Cosmic advanced text (#103)

* wip: update to use cosmic-advanced-text * use cosmic-advanced-text branch of iced * fix: line height and spacing for segmented button and update to get svg fix * fix: spin button styling & spacing * update iced to fix segmented button border radius * feat: example improvements * feat: helper for loading fonts * feat: add focus style to button * fix: slider height and iced fixed * feat: hash icon width and height * cleanup * update ci * refactor: always use lazy feature of iced * update iced * update iced * cleanup & update iced * update iced: new slider & tiny-skia quad updates * update iced: fixes for tiny-skia quad rendering with edge case border radius * re-export iced_runtime & iced_widget * merge master * udpate iced * update iced * update iced * update iced * fix: make rectangle_tracker subscription only return update if there is some * feat: derive macro for loading a cosmic-config * feat (cosmic-config): iced subscription * fix (example): update to rectangle tracker subscription * fix (cosmic-config) * refactor(cosmic-config-derive): add support for types with generic parameters * fix (cosmic-config): feature gate updates for subscription helpers * feat: support for custom & system themes + move cosmic-theme to libcosmic * feat: sorta hacky way of creating header bars for libcosmic + update iced to get support for resizable windows in iced-sctk * update iced * update and reexport sctk * fix: applet border radius * feat (cosmic-theme): add id and name methods * fix(cosmic-theme): reexport palette from cosmic-theme * fix(cosmic-config-derive): allow use with reexported cosmic-config * feat: update iced with fix and refactor applet env vars * update iced
2023-05-30 12:03:15 -04:00 · 2023-05-30 12:03:15 -04:00 · e056e8c830
commit e056e8c830
parent a173794bed
65 changed files with 3431 additions and 405 deletions
--- a/cosmic-config-derive/Cargo.toml
+++ b/cosmic-config-derive/Cargo.toml
@ -0,0 +1,12 @@
+[package]
+name = "cosmic-config-derive"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "1.0"
+quote = "1.0"
--- a/cosmic-config-derive/src/lib.rs
+++ b/cosmic-config-derive/src/lib.rs
@ -0,0 +1,85 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{self};
+
+#[proc_macro_derive(CosmicConfigEntry)]
+pub fn cosmic_config_entry_derive(input: TokenStream) -> TokenStream {
+    // Construct a representation of Rust code as a syntax tree
+    // that we can manipulate
+    let ast = syn::parse(input).unwrap();
+
+    // Build the trait implementation
+    impl_cosmic_config_entry_macro(&ast)
+}
+
+fn impl_cosmic_config_entry_macro(ast: &syn::DeriveInput) -> TokenStream {
+    let name = &ast.ident;
+    // let generics = &ast.generics;
+
+    // Get the fields of the struct
+    let fields = match ast.data {
+        syn::Data::Struct(ref data_struct) => match data_struct.fields {
+            syn::Fields::Named(ref fields) => &fields.named,
+            _ => unimplemented!("Only named fields are supported"),
+        },
+        _ => unimplemented!("Only structs are supported"),
+    };
+
+    let write_each_config_field = fields.iter().map(|field| {
+        let field_name = &field.ident;
+        quote! {
+            config.set(stringify!(#field_name), &self.#field_name)?;
+        }
+    });
+
+    let get_each_config_field = fields.iter().map(|field| {
+        let field_name = &field.ident;
+        let field_type = &field.ty;
+        quote! {
+            match config.get::<#field_type>(stringify!(#field_name)) {
+                Ok(#field_name) => default.#field_name = #field_name,
+                Err(e) => errors.push(e),
+            }
+        }
+    });
+
+    // // Get the existing where clause or create a new one if it doesn't exist
+    // let mut where_clause = ast
+    //     .generics
+    //     .where_clause
+    //     .clone()
+    //     .unwrap_or_else(|| parse_quote!(where));
+
+    // // Add your additional constraints to the where clause
+    // // Here, we add the constraint 'T: Debug' to all generic parameters
+    // for param in ast.generics.params.iter() {
+    //     where_clause
+    //         .predicates
+    //         .push(parse_quote!(#param: ::std::default::Default + ::serde::Serialize + ::serde::de::DeserializeOwned));
+    // }
+
+    let gen = quote! {
+        impl CosmicConfigEntry for #name {
+            fn write_entry(&self, config: &Config) -> Result<(), cosmic_config::Error> {
+                let tx = config.transaction();
+                #(#write_each_config_field)*
+                tx.commit()
+            }
+
+            fn get_entry(config: &Config) -> Result<Self, (Vec<cosmic_config::Error>, Self)> {
+                let mut default = Self::default();
+                let mut errors = Vec::new();
+
+                #(#get_each_config_field)*
+
+                if errors.is_empty() {
+                    Ok(default)
+                } else {
+                    Err((errors, default))
+                }
+            }
+        }
+    };
+
+    gen.into()
+}