diff --git a/applets/cosmic-app-list/Cargo.lock b/applets/cosmic-app-list/Cargo.lock index 5d15632b..43ea28b4 100644 --- a/applets/cosmic-app-list/Cargo.lock +++ b/applets/cosmic-app-list/Cargo.lock @@ -1466,7 +1466,7 @@ dependencies = [ [[package]] name = "iced" version = "0.6.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "iced_core", "iced_futures", @@ -1483,7 +1483,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.6.2" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "bitflags", "palette", @@ -1493,7 +1493,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.5.1" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "futures", "log", @@ -1505,7 +1505,7 @@ dependencies = [ [[package]] name = "iced_glow" version = "0.5.1" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "bytemuck", "euclid", @@ -1520,7 +1520,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.5.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "bitflags", "bytemuck", @@ -1540,7 +1540,7 @@ dependencies = [ [[package]] name = "iced_lazy" version = "0.3.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "iced_native", "ouroboros 0.13.0", @@ -1549,7 +1549,7 @@ dependencies = [ [[package]] name = "iced_native" version = "0.7.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "iced_core", "iced_futures", @@ -1563,7 +1563,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "enum-repr", "futures", @@ -1582,7 +1582,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.5.1" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "iced_core", "once_cell", @@ -1592,7 +1592,7 @@ dependencies = [ [[package]] name = "iced_swbuf" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "cosmic-text", "iced_graphics", @@ -1607,7 +1607,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.7.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "bitflags", "bytemuck", @@ -1786,7 +1786,7 @@ checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=master#5359ceb0f866c4052b37b7089b9bcf8f95788225" +source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" dependencies = [ "apply", "cosmic-panel-config", @@ -3033,7 +3033,7 @@ dependencies = [ [[package]] name = "swbuf" version = "0.1.1" -source = "git+https://github.com/rust-windowing/swbuf?branch=main#85b4f189bd152b580f52bf138a31db65bfff5a5a" +source = "git+https://github.com/rust-windowing/swbuf?branch=main#9b8641fc0700e2e19eb68fda30b7a92772ac0150" dependencies = [ "cocoa", "core-graphics", diff --git a/applets/cosmic-app-list/Cargo.toml b/applets/cosmic-app-list/Cargo.toml index 4a8e589b..ea0e8873 100644 --- a/applets/cosmic-app-list/Cargo.toml +++ b/applets/cosmic-app-list/Cargo.toml @@ -28,6 +28,3 @@ freedesktop-icons = {git = "https://github.com/wash2/freedestkop-icons"} i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } i18n-embed-fl = "0.6" rust-embed = "6.3" -# [patch."https://github.com/pop-os/iced"] -# iced = { path = "../../../cosmic-iced", features = ["image", "svg", "tokio", "wayland"]} - diff --git a/applets/cosmic-app-list/src/app.rs b/applets/cosmic-app-list/src/app.rs index 84ff5899..c67d002f 100644 --- a/applets/cosmic-app-list/src/app.rs +++ b/applets/cosmic-app-list/src/app.rs @@ -223,7 +223,7 @@ impl Application for CosmicAppList { let mut popup_settings = self.applet_helper.get_popup_settings( window::Id::new(0), new_id, - (200, 240 + toplevel_group.toplevels.len() as u32 * 20), + (240, 240 + toplevel_group.toplevels.len() as u32 * 24), None, None, ); @@ -463,7 +463,7 @@ impl Application for CosmicAppList { } // TODO tooltip on hover - let icon_button = mouse_listener(icon_button) + let icon_button = mouse_listener(icon_button.width(Length::Shrink).height(Length::Shrink)) .on_right_release(Message::Popup(desktop_info.id.clone())); let icon_button = if let Some(tracker) = self.rectangle_tracker.as_ref() { tracker.container(*id, icon_button).into() @@ -495,9 +495,8 @@ impl Application for CosmicAppList { .align_items(Alignment::Center) .height(Length::Fill) .width(Length::Fill), - ), + ).height(Length::Fill).width(Length::Fill), }; - if self.popup.is_some() { mouse_listener(content) .on_right_press(Message::ClosePopup) @@ -531,7 +530,7 @@ impl Application for CosmicAppList { let mut list_col = column![]; for (handle, info) in toplevels { let title = if info.title.len() > 20 { - format!("{:.20}...", &info.title) + format!("{:.24}...", &info.title) } else { info.title.clone() };