From f525e3747787d5bbbe2a23b7cdf164e730e4803e Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Fri, 8 Nov 2024 15:15:11 +0100 Subject: [PATCH] fix after rebase --- src/app.rs | 2 +- src/main.rs | 7 ++- src/modules/clipboard.rs | 4 +- src/modules/workspaces.rs | 98 +++++++++++++++------------------------ 4 files changed, 44 insertions(+), 67 deletions(-) diff --git a/src/app.rs b/src/app.rs index 1c7e4a9..820a181 100644 --- a/src/app.rs +++ b/src/app.rs @@ -137,7 +137,7 @@ impl App { if let Some(clipboard_cmd) = self.config.clipboard_cmd.as_ref() { utils::launcher::execute_command(clipboard_cmd.to_string()); } - Command::none() + Task::none() } Message::Workspaces(msg) => { self.workspaces.update(msg); diff --git a/src/main.rs b/src/main.rs index c7a8d05..baa4f7d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,12 +1,11 @@ use app::App; -use config::{read_config, Position}; +use config::read_config; use flexi_logger::{ Age, Cleanup, Criterion, FileSpec, LogSpecBuilder, LogSpecification, Logger, Naming, }; -use iced::Font; -use log::{error, LevelFilter}; +use log::error; use std::panic; -use std::{backtrace::Backtrace, borrow::Cow, panic}; +use std::{backtrace::Backtrace, borrow::Cow}; mod app; mod centerbox; diff --git a/src/modules/clipboard.rs b/src/modules/clipboard.rs index 0782d20..538a1de 100644 --- a/src/modules/clipboard.rs +++ b/src/modules/clipboard.rs @@ -3,12 +3,12 @@ use crate::{ components::icons::{icon, Icons}, style::HeaderButtonStyle, }; -use iced::{theme, widget::button, Element}; +use iced::{widget::button, Element}; pub fn clipboard<'a>() -> Element<'a, Message> { button(icon(Icons::Clipboard)) .padding([2, 7]) .on_press(Message::OpenClipboard) - .style(theme::Button::custom(HeaderButtonStyle::Full)) + .style(HeaderButtonStyle::Full.into_style()) .into() } diff --git a/src/modules/workspaces.rs b/src/modules/workspaces.rs index a34c5d0..98d6a98 100644 --- a/src/modules/workspaces.rs +++ b/src/modules/workspaces.rs @@ -11,8 +11,7 @@ use iced::{ alignment, stream::channel, widget::{button, container, text, Row}, - widget::{container, mouse_area, text, Row}, - Background, Border, Color, Element, Element, Length, Length, Subscription, Subscription, Theme, + Element, Length, Subscription, }; use log::{debug, error}; use std::{ @@ -238,18 +237,13 @@ impl Workspaces { move |e| { debug!("workspace added: {:?}", e); let output = output.clone(); - move |_| { - let output = output.clone(); - Box::pin(async move { - if let Ok(mut output) = output.write() { - output - .try_send(Message::WorkspacesChanged(get_workspaces())) - .expect( - "error getting workspaces: workspace added event", - ); - } - }) - } + Box::pin(async move { + if let Ok(mut output) = output.write() { + output + .try_send(Message::WorkspacesChanged(get_workspaces())) + .expect("error getting workspaces: workspace added event"); + } + }) } }); @@ -258,18 +252,13 @@ impl Workspaces { move |e| { debug!("workspace changed: {:?}", e); let output = output.clone(); - move |_| { - let output = output.clone(); - Box::pin(async move { - if let Ok(mut output) = output.write() { - output - .try_send(Message::WorkspacesChanged(get_workspaces())) - .expect( - "error getting workspaces: workspace change event", - ); - } - }) - } + Box::pin(async move { + if let Ok(mut output) = output.write() { + output + .try_send(Message::WorkspacesChanged(get_workspaces())) + .expect("error getting workspaces: workspace change event"); + } + }) } }); @@ -278,18 +267,15 @@ impl Workspaces { move |e| { debug!("workspace deleted: {:?}", e); let output = output.clone(); - move |_| { - let output = output.clone(); - Box::pin(async move { - if let Ok(mut output) = output.write() { - output - .try_send(Message::WorkspacesChanged(get_workspaces())) - .expect( - "error getting workspaces: workspace destroy event", - ); - } - }) - } + Box::pin(async move { + if let Ok(mut output) = output.write() { + output + .try_send(Message::WorkspacesChanged(get_workspaces())) + .expect( + "error getting workspaces: workspace destroy event", + ); + } + }) } }); @@ -298,18 +284,13 @@ impl Workspaces { move |e| { debug!("workspace moved: {:?}", e); let output = output.clone(); - move |_| { - let output = output.clone(); - Box::pin(async move { - if let Ok(mut output) = output.write() { - output - .try_send(Message::WorkspacesChanged(get_workspaces())) - .expect( - "error getting workspaces: workspace moved event", - ); - } - }) - } + Box::pin(async move { + if let Ok(mut output) = output.write() { + output + .try_send(Message::WorkspacesChanged(get_workspaces())) + .expect("error getting workspaces: workspace moved event"); + } + }) } }); @@ -351,16 +332,13 @@ impl Workspaces { let output = output.clone(); move |_| { let output = output.clone(); - move |_| { - let output = output.clone(); - Box::pin(async move { - if let Ok(mut output) = output.write() { - output - .try_send(Message::WorkspacesChanged(get_workspaces())) - .expect("error getting workspaces: window close event"); - } - }) - } + Box::pin(async move { + if let Ok(mut output) = output.write() { + output + .try_send(Message::WorkspacesChanged(get_workspaces())) + .expect("error getting workspaces: window close event"); + } + }) } });