leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: dnd panic on applet page

Browse source
This commit is contained in:
Ashley Wulber 2023-12-11 15:54:57 -05:00 • committed by Michael Murphy
parent d31359e8c6
commit 01328729d6
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -22,7 +22,7 @@ git = "https://github.com/pop-os/cosmic-comp"
[workspace.dependencies.cosmic-panel-config] [workspace.dependencies.cosmic-panel-config]
git = "https://github.com/pop-os/cosmic-panel" git = "https://github.com/pop-os/cosmic-panel"
[patch."https://github.com/pop-os/libcosmic"] # [patch."https://github.com/pop-os/libcosmic"]
# libcosmic = { path = "../libcosmic" } # libcosmic = { path = "../libcosmic" }
# cosmic-config = { path = "../libcosmic/cosmic-config" } # cosmic-config = { path = "../libcosmic/cosmic-config" }
@ -34,4 +34,5 @@ sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay
[profile.release] [profile.release]
opt-level = 3 opt-level = 3
debug = true
lto = "thin" lto = "thin"

15
app/src/pages/desktop/panel/applets_inner.rs
View file

@ -2,8 +2,8 @@ use button::StyleSheet as ButtonStyleSheet;
use cosmic::iced_style::container::StyleSheet; use cosmic::iced_style::container::StyleSheet;
use cosmic::widget::{ use cosmic::widget::{
button, column, container, header_bar, icon, list_column, row, scrollable, text, text_input, button, column, container, header_bar, horizontal_space, icon, list_column, row, scrollable,
Column, text, text_input, Column,
}; };
use cosmic::{ use cosmic::{
@ -625,7 +625,7 @@ pub fn lists<
}) })
} }
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Default, Clone, PartialEq, Eq)]
pub struct Applet<'a> { pub struct Applet<'a> {
pub id: Cow<'a, str>, pub id: Cow<'a, str>,
pub name: Cow<'a, str>, pub name: Cow<'a, str>,
@ -848,7 +848,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
}))) })))
.into() .into()
} else { } else {
text("unknown").into() horizontal_space(1).into()
}, },
on_cancel: None, on_cancel: None,
} }
@ -936,7 +936,7 @@ where
} }
fn diff(&mut self, tree: &mut Tree) { fn diff(&mut self, tree: &mut Tree) {
tree.diff_children(std::slice::from_mut(&mut self.inner)); self.inner.as_widget_mut().diff(&mut tree.children[0]);
} }
fn width(&self) -> Length { fn width(&self) -> Length {
@ -953,7 +953,10 @@ where
renderer: &cosmic::Renderer, renderer: &cosmic::Renderer,
limits: &layout::Limits, limits: &layout::Limits,
) -> layout::Node { ) -> layout::Node {
let inner_layout = self.inner.as_widget().layout(tree, renderer, limits); let inner_layout = self
.inner
.as_widget()
.layout(&mut tree.children[0], renderer, limits);
layout::Node::with_children(inner_layout.size(), vec![inner_layout]) layout::Node::with_children(inner_layout.size(), vec![inner_layout])
} }