fix: resolve rebase conflicts and fix package name

Cargo.lock

@@ -866,7 +866,7 @@ checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
  "serde",
  "termcolor",
- "unicode-width 0.1.14",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -989,7 +989,6 @@ dependencies = [
  "anyhow",
  "bitflags 2.11.0",
  "calloop",
- "cgmath",
  "clap_lex",
  "cosmic-comp-config",
  "cosmic-config",
@@ -1001,14 +1000,16 @@ dependencies = [
  "egui_plot",
  "futures-executor",
  "futures-util",
+ "glam 0.33.2",
  "i18n-embed",
  "i18n-embed-fl",
+ "iced_graphics",
  "iced_tiny_skia",
  "id_tree",
  "indexmap 2.13.0",
  "jiff",
  "keyframe",
- "libcosmic-yoda",
+ "libcosmic",
  "libdisplay-info",
  "libsystemd",
  "log-panics",
@@ -1025,6 +1026,7 @@ dependencies = [
  "sanitize-filename",
  "serde",
  "serde_json",
+ "smallvec",
  "smithay",
  "smithay-egui",
  "thiserror 2.0.18",
@@ -2160,6 +2162,12 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
 
+[[package]]
+name = "glam"
+version = "0.33.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f22fb22f065b308be0d8724e3706c7fa3fc2a6c7d6899df4cad7860e7a75436"
+
 [[package]]
 name = "glow"
 version = "0.16.0"
@@ -2474,7 +2482,7 @@ dependencies = [
  "bytes",
  "cosmic-client-toolkit",
  "dnd",
- "glam",
+ "glam 0.25.0",
  "lilt",
  "log",
  "mime 0.1.0",
@@ -2590,7 +2598,7 @@ dependencies = [
  "cosmic-client-toolkit",
  "cryoglyph",
  "futures",
- "glam",
+ "glam 0.25.0",
  "guillotiere",
  "iced_debug",
  "iced_graphics",
@@ -3131,7 +3139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
-name = "libcosmic-yoda"
+name = "libcosmic"
 version = "0.1.0-yoda.2"
 dependencies = [
  "apply",
@@ -5249,14 +5257,14 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "smithay"
 version = "0.7.0"
-source = "git+https://github.com/smithay/smithay.git?rev=8eb4076#8eb4076cad8705c56f5e3bac8577b83576b6ce76"
+source = "git+https://github.com/smithay/smithay.git?rev=1ed69cb#1ed69cb55e9d0e9f38887c3b7d53d24365c4b14f"
 dependencies = [
  "aliasable",
  "appendlist",
@@ -5265,7 +5273,6 @@ dependencies = [
  "bitflags 2.11.0",
  "calloop",
  "cc",
- "cgmath",
  "cursor-icon",
  "downcast-rs",
  "drm",
@@ -5275,6 +5282,7 @@ dependencies = [
  "errno",
  "gbm",
  "gl_generator",
+ "glam 0.33.2",
  "glow",
  "indexmap 2.13.0",
  "input",

Cargo.toml

@@ -43,7 +43,7 @@ iced_tiny_skia = { path = "../libcosmic/iced/tiny_skia" }
 iced_graphics = { path = "../libcosmic/iced/graphics", features = ["geometry"] }
 indexmap = "2.13"
 keyframe = "1.1.1"
-cosmic = { package = "libcosmic-yoda", path = "../libcosmic", default-features = false, features = [
+cosmic = { package = "libcosmic", path = "../libcosmic", default-features = false, features = [
     "tokio",
     "wayland",
     "multi-window",
@@ -145,7 +145,7 @@ inherits = "release"
 [profile.release]
 lto = "fat"
 
-[patch('https://github.com/pop-os/libcosmic')]
+[patch."https://github.com/pop-os/libcosmic"]
 cosmic-config = { path = "../libcosmic/cosmic-config" }
 cosmic-theme = { path = "../libcosmic/cosmic-theme" }
 iced = { path = "../libcosmic/iced" }
@@ -160,20 +160,18 @@ iced_wgpu = { path = "../libcosmic/iced/wgpu" }
 iced_widget = { path = "../libcosmic/iced/widget" }
 iced_winit = { path = "../libcosmic/iced/winit" }
 
-[patch('https://github.com/pop-os/cosmic-protocols')]
+[patch."https://github.com/pop-os/cosmic-protocols"]
 cosmic-protocols = { path = "../cosmic-protocols" }
 cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
 
-[patch('https://github.com/pop-os/cosmic-settings-daemon')]
+[patch."https://github.com/pop-os/cosmic-settings-daemon"]
 cosmic-settings-config = { path = "../cosmic-settings-daemon/config" }
 cosmic-settings-daemon-config = { path = "../cosmic-settings-daemon/cosmic-settings-daemon-config" }
 
-[patch('https://github.com/pop-os/cosmic-text.git')]
-cosmic-text = { path = "../cosmic-text" }
-[patch.'https://github.com/pop-os/cosmic-text.git']
+[patch."https://github.com/pop-os/cosmic-text.git"]
 cosmic-text = { path = "../cosmic-text" }
 
-[patch('https://forge.aditua.com/leyoda/window_clipboard.git')]
+[patch."https://forge.aditua.com/leyoda/window_clipboard.git"]
 window_clipboard = { path = "../window_clipboard" }
 dnd = { path = "../window_clipboard/dnd" }
 mime = { path = "../window_clipboard/mime" }

src/shell/element/stack.rs

@@ -1381,8 +1381,6 @@ impl Decorations<CosmicStackInternal, Message> for DefaultDecorations {
                     snap: true,
                     icon_color: Some(cosmic_theme.background(false).on.into()),
                     text_color: Some(cosmic_theme.background(false).on.into()),
-                    icon_color: Some(cosmic_theme.background(false).on.into()),
-                    text_color: Some(cosmic_theme.background(false).on.into()),
                     background: Some(Background::Color(background.into())),
                     border: Border {
                         radius,

src/shell/element/stack/tab.rs

@@ -66,9 +66,6 @@ impl From<TabBackgroundTheme> for theme::Container<'_> {
                     background: Some(Background::Color(
                         theme.cosmic().primary(false).component.selected.into(),
                     )),
-                    background: Some(Background::Color(
-                        theme.cosmic().primary(false).component.selected.into(),
-                    )),
                     border: Border {
                         radius: 0.0.into(),
                         width: 0.0,
@@ -85,9 +82,6 @@ impl From<TabBackgroundTheme> for theme::Container<'_> {
                     background: Some(Background::Color(
                         theme.cosmic().primary(false).component.base.into(),
                     )),
-                    background: Some(Background::Color(
-                        theme.cosmic().primary(false).component.base.into(),
-                    )),
                     border: Border {
                         radius: 0.0.into(),
                         width: 0.0,

src/shell/element/window.rs

@@ -832,7 +832,6 @@ impl Program for CosmicWindowInternal {
     fn background_color(&self, theme: &cosmic::Theme) -> Color {
         if self.window.is_maximized(false) {
             theme.cosmic().background(false).base.into()
-            theme.cosmic().background(false).base.into()
         } else {
             Color::TRANSPARENT
         }