chore: migrate from iced_layershell to iced_exwlshell

Signed-off-by: Maika Namuo <httpworldview@gmail.com>

Author: httpsworldview

Cargo.lock

@@ -40,10 +40,10 @@ wayland-client = "0.31.15"
   default-features = false
   features = [ "env-filter", "fmt" ]
 
-  [dependencies.iced_layershell]
-  git = "https://github.com/waycrate/exwlshelleventloop"
-  rev = "26a318d714a6324ba014110b8fb5086fdf667169"
+  [dependencies.iced_exwlshell]
+  version = "0.20.0"
   default-features = false
+  features = [ "macros" ]
 
 [dev-dependencies]
 ebur128 = "0.1.10"

Cargo.toml

@@ -333,7 +333,7 @@ out.
 
 ### Libraries
 
-- **iced_layershell** and related crates
+- **iced_exwlshell** and related crates
   (<https://github.com/waycrate/exwlshelleventloop>)
   - Special thanks to Decodetalkers for reviewing and merging my
     patches, and for maintaining such a useful library.

README.md

@@ -24,7 +24,7 @@ use iced::{
     Element, Length, Settings as IcedSettings, Size, Subscription, Task, daemon as iced_daemon,
     window,
 };
-use iced_layershell::settings::{LayerShellSettings, Settings as LayerSettings, StartMode};
+use iced_exwlshell::settings::{LayerShellSettings, Settings as LayerSettings, StartMode};
 use message::{Message, app_event, shell_event, update, view};
 use std::cell::RefCell;
 use std::collections::HashMap;
@@ -65,8 +65,8 @@ pub(crate) struct UiConfig {
 
 pub(crate) fn run(config: UiConfig) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     if layershell_available() {
-        let (shell_broadcast, shell_events) = iced_layershell::shell::channel();
-        iced_layershell::daemon(
+        let (shell_broadcast, shell_events) = iced_exwlshell::shell::channel();
+        iced_exwlshell::daemon(
             move || UiApp::new(config.clone(), true),
             || APP_ID.to_string(),
             update,

src/ui/app.rs

@@ -10,10 +10,10 @@ use iced::event::{self, Event};
 use iced::keyboard::{self, Key};
 use iced::widget::text;
 use iced::{Element, Size, Task, exit, mouse, window};
-use iced_layershell::actions::IcedXdgWindowSettings;
-use iced_layershell::reexport::NewLayerShellSettings;
-use iced_layershell::shell::ShellEvent;
-use iced_layershell::to_layer_message;
+use iced_exwlshell::actions::IcedXdgWindowSettings;
+use iced_exwlshell::reexport::NewLayerShellSettings;
+use iced_exwlshell::shell::ShellEvent;
+use iced_exwlshell::to_layer_message;
 use std::time::Instant;
 
 #[to_layer_message(multi)]

src/ui/app/message.rs

@@ -12,7 +12,7 @@ use crate::ui::widgets::{fill, scroll_glow::ScrollGlow};
 use crate::visuals::registry::{VisualContent, VisualKind, VisualSlotSnapshot};
 use iced::widget::mouse_area;
 use iced::{Element, Size, Task, exit, window};
-use iced_layershell::reexport::{
+use iced_exwlshell::reexport::{
     Anchor, KeyboardInteractivity, Layer, LayerSize, NewLayerShellSettings, OutputOption, PixelSize,
 };
 use wayland_client::globals::{GlobalListContents, registry_queue_init};
@@ -80,7 +80,7 @@ fn open_base_window(
 ) -> (window::Id, Task<Message>) {
     if layershell {
         let (width, height) = persisted_window_size(size);
-        let settings = iced_layershell::actions::IcedXdgWindowSettings {
+        let settings = iced_exwlshell::actions::IcedXdgWindowSettings {
             size: Some(PixelSize::px(width, height)),
             client_side_decorations: !decorations,
         };