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

fix(applet): don't force icons to be symbolic

Browse source
This commit is contained in:
Ashley Wulber 2024-05-10 18:40:19 -04:00 • committed by Michael Murphy
parent 1db58f56cc
commit c877209f72
2 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cosmic-settings/src/pages/desktop/dock/applets.rs
View file

@ -1,7 +1,6 @@
use cosmic::{cosmic_config::CosmicConfigEntry, iced::window, iced_runtime::Command, Element}; use cosmic::{cosmic_config::CosmicConfigEntry, iced_runtime::Command, Element};
use cosmic_panel_config::CosmicPanelConfig; use cosmic_panel_config::CosmicPanelConfig;
use cosmic_settings_page::{self as page, section, Section}; use cosmic_settings_page::{self as page, section, Section};
use once_cell::sync::Lazy;
use slotmap::SlotMap; use slotmap::SlotMap;
use std::borrow::Cow; use std::borrow::Cow;

22
cosmic-settings/src/pages/desktop/panel/applets_inner.rs
View file

@ -2,8 +2,7 @@ use button::StyleSheet as ButtonStyleSheet;
use cosmic::iced_style::container::StyleSheet; use cosmic::iced_style::container::StyleSheet;
use cosmic::widget::{ use cosmic::widget::{
self, button, column, container, header_bar, horizontal_space, icon, list_column, row, button, column, container, horizontal_space, icon, list_column, row, text, text_input, Column,
scrollable, text, text_input, Column,
}; };
use cosmic::{ use cosmic::{
@ -17,15 +16,11 @@ use cosmic::{
PlatformSpecific, PlatformSpecific,
}, },
mouse, overlay, touch, mouse, overlay, touch,
wayland::actions::{ wayland::actions::data_device::{ActionInner, DataFromMimeType, DndIcon},
data_device::{ActionInner, DataFromMimeType, DndIcon},
window::SctkWindowSettings,
},
wayland::data_device::action as data_device_action, wayland::data_device::action as data_device_action,
window, Alignment, Color, Length, Point, Rectangle, Size, window, Alignment, Color, Length, Point, Rectangle, Size,
}, },
iced_runtime::{command::platform_specific, core::id::Id, Command}, iced_runtime::{command::platform_specific, core::id::Id, Command},
iced_sctk::commands,
iced_widget::{ iced_widget::{
core::{ core::{
layout, renderer, layout, renderer,
@ -252,11 +247,7 @@ impl Page {
has_some = true; has_some = true;
list_column = list_column.add( list_column = list_column.add(
row::with_children(vec![ row::with_children(vec![
icon::from_name(&*info.icon) icon::from_name(&*info.icon).size(32).icon().into(),
.size(32)
.symbolic(true)
.icon()
.into(),
column::with_capacity(2) column::with_capacity(2)
.push(text(info.name.clone())) .push(text(info.name.clone()))
.push(text(info.description.clone()).size(10)) .push(text(info.description.clone()).size(10))
@ -684,7 +675,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
.symbolic(true) .symbolic(true)
.size(16) .size(16)
.into(), .into(),
icon::from_name(info.icon).size(32).symbolic(true).into(), icon::from_name(info.icon).size(32).into(),
column::with_capacity(2) column::with_capacity(2)
.spacing(4.0) .spacing(4.0)
.width(Length::Fill) .width(Length::Fill)
@ -773,10 +764,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
.size(16) .size(16)
.symbolic(true) .symbolic(true)
.into(), .into(),
icon::from_name(info.icon.into_owned()) icon::from_name(info.icon.into_owned()).size(32).into(),
.size(32)
.symbolic(true)
.into(),
column::with_capacity(2) column::with_capacity(2)
.spacing(4.0) .spacing(4.0)
.width(Length::Fill) .width(Length::Fill)