diff --git a/data/icons/com.system76.CosmicAppLibrary-symbolic.svg b/data/icons/com.system76.CosmicAppLibrary-symbolic.svg deleted file mode 100644 index fc4d934..0000000 --- a/data/icons/com.system76.CosmicAppLibrary-symbolic.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/com.system76.CosmicAppLibrary.Devel.svg b/data/icons/com.system76.CosmicAppLibrary.Devel.svg deleted file mode 100644 index 92533ae..0000000 --- a/data/icons/com.system76.CosmicAppLibrary.Devel.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/com.system76.CosmicAppLibrary.svg b/data/icons/com.system76.CosmicAppLibrary.svg index c2bd5b1..f88e403 100644 --- a/data/icons/com.system76.CosmicAppLibrary.svg +++ b/data/icons/com.system76.CosmicAppLibrary.svg @@ -1,60 +1,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/justfile b/data/icons/justfile index 903059a..54cdece 100644 --- a/data/icons/justfile +++ b/data/icons/justfile @@ -4,12 +4,9 @@ install-dir := env_var('INSTALL_DIR') scalable-src := appid + '.svg' scalable-dst := install-dir / 'icons' / 'hicolor' / 'scalable' / 'apps' / scalable-src -symbolic-src := appid + '-symbolic.svg' -symbolic-dst := install-dir / 'icons' / 'hicolor' / 'symbolic' / 'apps' / symbolic-src - install: install -Dm0644 {{scalable-src}} {{scalable-dst}} - install -Dm0644 {{symbolic-src}} {{symbolic-dst}} + uninstall: - rm {{scalable-dst}} {{symbolic-dst}} \ No newline at end of file + rm {{scalable-dst}} diff --git a/rust-toolchain b/rust-toolchain index bfe79d0..cc31fcd 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.70 +1.72 diff --git a/src/app.rs b/src/app.rs index 1eaf573..c490012 100644 --- a/src/app.rs +++ b/src/app.rs @@ -459,14 +459,28 @@ impl cosmic::Application for CosmicAppLibrary { fn view_window(&self, id: SurfaceId) -> Element { if id == DND_ICON_ID { - let Some(icon_path) = self.dnd_icon.clone().and_then(|i| self.entry_path_input.get(i).map(|e| e.icon.clone())) else { - return container(horizontal_space(Length::Fixed(1.0))).width(Length::Fixed(1.0)).height(Length::Fixed(1.0)).into(); + let Some(icon_path) = self + .dnd_icon + .clone() + .and_then(|i| self.entry_path_input.get(i).map(|e| e.icon.clone())) + else { + return container(horizontal_space(Length::Fixed(1.0))) + .width(Length::Fixed(1.0)) + .height(Length::Fixed(1.0)) + .into(); }; return icon(icon_path, 64).into(); } if id == MENU_ID { - let Some((menu, i)) = self.menu.as_ref().and_then(|i| self.entry_path_input.get(*i).map(|e| (e, i))) else { - return container(horizontal_space(Length::Fixed(1.0))).width(Length::Fixed(1.0)).height(Length::Fixed(1.0)).into(); + let Some((menu, i)) = self + .menu + .as_ref() + .and_then(|i| self.entry_path_input.get(*i).map(|e| (e, i))) + else { + return container(horizontal_space(Length::Fixed(1.0))) + .width(Length::Fixed(1.0)) + .height(Length::Fixed(1.0)) + .into(); }; let mut list_column = column![cosmic::iced::widget::button(text(RUN.clone())) .style(theme::Button::Custom { @@ -547,7 +561,10 @@ impl cosmic::Application for CosmicAppLibrary { } if id == NEW_GROUP_WINDOW_ID { let Some(group_name) = self.new_group.as_ref() else { - return container(horizontal_space(Length::Fixed(1.0))).width(Length::Fixed(1.0)).height(Length::Fixed(1.0)).into(); + return container(horizontal_space(Length::Fixed(1.0))) + .width(Length::Fixed(1.0)) + .height(Length::Fixed(1.0)) + .into(); }; let dialog = column![ text_input(&NEW_GROUP_PLACEHOLDER, &group_name) diff --git a/src/widgets/application.rs b/src/widgets/application.rs index 00c5026..84456d5 100644 --- a/src/widgets/application.rs +++ b/src/widgets/application.rs @@ -280,7 +280,7 @@ where viewport, ); - let mut state = tree.state.downcast_mut::(); + let state = tree.state.downcast_mut::(); if cursor_position.is_over(layout.bounds()) { match &event { diff --git a/src/widgets/group.rs b/src/widgets/group.rs index ab940ec..2af94a6 100644 --- a/src/widgets/group.rs +++ b/src/widgets/group.rs @@ -250,7 +250,7 @@ where viewport, ); - let mut state = tree.state.downcast_mut::(); + let state = tree.state.downcast_mut::(); if let (Some(on_dnd_command_produced), Some(on_offer), Some(on_cancel), Some(on_finish)) = ( self.on_dnd_command_produced.as_ref(),