Skip to content

Commit dba405d

Browse files
git-f0xgit-f0x
committed
fix: use text::body
1 parent ed07e40 commit dba405d

File tree

11 files changed

+55
-50
lines changed

11 files changed

+55
-50
lines changed

‎cosmic-settings/src/pages/desktop/appearance.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ impl Page {
431431
model: impl Fn(&Self) -> &ColorPickerModel,
432432
) -> Element<'_, crate::pages::Message> {
433433
cosmic::widget::column()
434-
.push_maybe(description.map(|description| text(description).width(Length::Fill)))
434+
.push_maybe(description.map(|description| text::body(description).width(Length::Fill)))
435435
.push(
436436
model(self)
437437
.builder(on_update)
@@ -1175,7 +1175,7 @@ pub fn mode_and_colors() -> Section<crate::pages::Message> {
11751175
.padding([8, 0])
11761176
.selected(page.theme_mode.is_dark)
11771177
.on_press(Message::DarkMode(true)),
1178-
text(&descriptions[dark])
1178+
text::body(&descriptions[dark])
11791179
]
11801180
.spacing(8)
11811181
.width(Length::FillPortion(1))
@@ -1190,7 +1190,7 @@ pub fn mode_and_colors() -> Section<crate::pages::Message> {
11901190
.selected(!page.theme_mode.is_dark)
11911191
.padding([8, 0])
11921192
.on_press(Message::DarkMode(false)),
1193-
text(&descriptions[light])
1193+
text::body(&descriptions[light])
11941194
]
11951195
.spacing(8)
11961196
.width(Length::FillPortion(1))
@@ -1221,7 +1221,7 @@ pub fn mode_and_colors() -> Section<crate::pages::Message> {
12211221
)
12221222
.add(
12231223
cosmic::iced::widget::column![
1224-
text(&descriptions[accent_color]),
1224+
text::body(&descriptions[accent_color]),
12251225
scrollable(
12261226
cosmic::iced::widget::row![
12271227
color_button(
@@ -1420,7 +1420,7 @@ pub fn style() -> Section<crate::pages::Message> {
14201420
.style(button::Style::Image)
14211421
.padding(8)
14221422
.on_press(Message::Roundness(Roundness::Round)),
1423-
text(&descriptions[round])
1423+
text::body(&descriptions[round])
14241424
]
14251425
.spacing(8)
14261426
.width(Length::FillPortion(1))
@@ -1442,7 +1442,7 @@ pub fn style() -> Section<crate::pages::Message> {
14421442
.style(button::Style::Image)
14431443
.padding(8)
14441444
.on_press(Message::Roundness(Roundness::SlightlyRound)),
1445-
text(&descriptions[slightly_round])
1445+
text::body(&descriptions[slightly_round])
14461446
]
14471447
.spacing(8)
14481448
.width(Length::FillPortion(1))
@@ -1465,7 +1465,7 @@ pub fn style() -> Section<crate::pages::Message> {
14651465
.style(button::Style::Image)
14661466
.padding(8)
14671467
.on_press(Message::Roundness(Roundness::Square)),
1468-
text(&descriptions[square])
1468+
text::body(&descriptions[square])
14691469
]
14701470
.spacing(8)
14711471
.align_items(cosmic::iced_core::Alignment::Center)
@@ -1877,7 +1877,7 @@ fn icon_theme_button(
18771877
}),
18781878
)
18791879
.push(
1880-
text(if name.len() > ICON_NAME_TRUNC {
1880+
text::body(if name.len() > ICON_NAME_TRUNC {
18811881
format!("{name:.ICON_NAME_TRUNC$}...")
18821882
} else {
18831883
name.into()

‎cosmic-settings/src/pages/desktop/dock/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ pub(crate) fn enable() -> Section<crate::pages::Message> {
152152
.view::<Page>(move |_binder, page, section| {
153153
let descriptions = &section.descriptions;
154154
let Some(container_config) = page.inner.container_config.as_ref() else {
155-
return Element::from(text(fl!("unknown")));
155+
return Element::from(text::body(fl!("unknown")));
156156
};
157157
settings::view_section(&section.title)
158158
.add(settings::item(

‎cosmic-settings/src/pages/desktop/panel/applets_inner.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,12 @@ impl Page {
264264
row::with_children(vec![
265265
icon::from_name(&*info.icon).size(32).icon().into(),
266266
column::with_capacity(2)
267-
.push(text(info.name.clone()))
268-
.push(text(info.description.clone()).size(10))
267+
.push(text::body(info.name.clone()))
268+
.push(text::caption(info.description.clone()))
269269
.spacing(spacing.space_xxxs)
270270
.width(Length::Fill)
271271
.into(),
272-
button(text(fl!("add")))
272+
button(text::body(fl!("add")))
273273
.style(button::Style::Custom {
274274
active: Box::new(|focused, theme| {
275275
let mut style = theme.active(focused, false, &button::Style::Text);
@@ -305,7 +305,7 @@ impl Page {
305305
}
306306
if !has_some {
307307
list_column = list_column.add(
308-
text(fl!("no-applets-found"))
308+
text::body(fl!("no-applets-found"))
309309
.width(Length::Fill)
310310
.horizontal_alignment(Horizontal::Center),
311311
);
@@ -472,12 +472,12 @@ pub fn lists<
472472
let spacing = cosmic::theme::active().cosmic().spacing;
473473
let page = page.inner();
474474
let Some(config) = page.current_config.as_ref() else {
475-
return Element::from(text(fl!("unknown")));
475+
return Element::from(text::body(fl!("unknown")));
476476
};
477477

478478
column::with_children(vec![
479479
column::with_children(vec![
480-
text(fl!("start-segment")).into(),
480+
text::body(fl!("start-segment")).into(),
481481
AppletReorderList::new(
482482
config
483483
.plugins_wings
@@ -509,7 +509,7 @@ pub fn lists<
509509
.spacing(spacing.space_xxs)
510510
.into(),
511511
column::with_children(vec![
512-
text(fl!("center-segment")).into(),
512+
text::body(fl!("center-segment")).into(),
513513
AppletReorderList::new(
514514
config
515515
.plugins_center
@@ -540,7 +540,7 @@ pub fn lists<
540540
.spacing(spacing.space_xxs)
541541
.into(),
542542
column::with_children(vec![
543-
text(fl!("end-segment")).into(),
543+
text::body(fl!("end-segment")).into(),
544544
AppletReorderList::new(
545545
config
546546
.plugins_wings
@@ -689,7 +689,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
689689
column::with_capacity(2)
690690
.spacing(spacing.space_xxxs)
691691
.width(Length::Fill)
692-
.push(text(info.name))
692+
.push(text::body(info.name))
693693
.push_maybe(if info.description.is_empty() {
694694
None
695695
} else {
@@ -730,7 +730,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
730730
surface_ids,
731731
inner: if active_dnd.is_some() && applet_buttons.is_empty() {
732732
container(
733-
text(fl!("drop-here"))
733+
text::body(fl!("drop-here"))
734734
.width(Length::Fill)
735735
.height(Length::Fill)
736736
.vertical_alignment(Vertical::Center)
@@ -778,7 +778,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
778778
column::with_capacity(2)
779779
.spacing(4.0)
780780
.width(Length::Fill)
781-
.push(text(info.name))
781+
.push(text::body(info.name))
782782
.push(text::caption(info.description))
783783
.into(),
784784
button::icon(icon::from_name("edit-delete-symbolic"))

‎cosmic-settings/src/pages/desktop/panel/inner.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ pub(crate) fn behavior_and_position<
107107
let descriptions = &section.descriptions;
108108
let page = page.inner();
109109
let Some(panel_config) = page.panel_config.as_ref() else {
110-
return Element::from(text(fl!("unknown")));
110+
return Element::from(text::body(fl!("unknown")));
111111
};
112112
settings::view_section(&section.title)
113113
.add(settings::item(
@@ -163,7 +163,7 @@ pub(crate) fn style<
163163
let descriptions = &section.descriptions;
164164
let inner = page.inner();
165165
let Some(panel_config) = inner.panel_config.as_ref() else {
166-
return Element::from(text(fl!("unknown")));
166+
return Element::from(text::body(fl!("unknown")));
167167
};
168168
settings::view_section(&section.title)
169169
.add(settings::item(
@@ -195,7 +195,7 @@ pub(crate) fn style<
195195
&descriptions[size],
196196
// TODO custom discrete slider variant
197197
row::with_children(vec![
198-
text(fl!("small")).into(),
198+
text::body(fl!("small")).into(),
199199
slider(
200200
0..=4,
201201
match panel_config.size {
@@ -220,20 +220,20 @@ pub(crate) fn style<
220220
},
221221
)
222222
.into(),
223-
text(fl!("large")).into(),
223+
text::body(fl!("large")).into(),
224224
])
225225
.spacing(12),
226226
))
227227
.add(settings::flex_item(
228228
&descriptions[background_opacity],
229229
row::with_children(vec![
230-
text(fl!("number", HashMap::from_iter(vec![("number", 0)]))).into(),
230+
text::body(fl!("number", HashMap::from_iter(vec![("number", 0)]))).into(),
231231
slider(0..=100, (panel_config.opacity * 100.0) as i32, |v| {
232232
Message::Opacity(v as f32 / 100.0)
233233
})
234234
.breakpoints(&[50])
235235
.into(),
236-
text(fl!("number", HashMap::from_iter(vec![("number", 100)]))).into(),
236+
text::body(fl!("number", HashMap::from_iter(vec![("number", 100)]))).into(),
237237
])
238238
.spacing(12),
239239
))

‎cosmic-settings/src/pages/input/keyboard/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ fn popover_menu_row(
133133
label: String,
134134
message: impl Fn(DefaultKey) -> SourceContext + 'static,
135135
) -> cosmic::Element<'static, Message> {
136-
widget::text(label)
136+
widget::text::body(label)
137137
.apply(widget::container)
138138
.style(cosmic::theme::Container::custom(|theme| {
139139
iced_style::container::Appearance {

‎cosmic-settings/src/pages/input/mouse.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn mouse() -> Section<crate::pages::Message> {
8181
row::with_capacity(2)
8282
.align_items(Alignment::Center)
8383
.spacing(theme.cosmic().space_s())
84-
.push(text(format!("{:.0}", value.round())))
84+
.push(text::body(format!("{:.0}", value.round())))
8585
.push(slider)
8686
}),
8787
)
@@ -140,7 +140,7 @@ fn scrolling() -> Section<crate::pages::Message> {
140140
row::with_capacity(2)
141141
.align_items(Alignment::Center)
142142
.spacing(theme.cosmic().space_s())
143-
.push(text(format!("{:.0}", value.round())))
143+
.push(text::body(format!("{:.0}", value.round())))
144144
.push(slider)
145145
}))
146146
.add(

‎cosmic-settings/src/pages/power/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ fn battery_info() -> Section<crate::pages::Message> {
7878
.show_while::<Page>(|page| page.battery.is_present)
7979
.view::<Page>(move |_binder, page, section| {
8080
let battery_icon = widget::icon::from_name(page.battery.icon_name.clone());
81-
let battery_percent = widget::text(format!("{}%", page.battery.percent));
81+
let battery_percent = widget::text::body(format!("{}%", page.battery.percent));
8282

8383
let battery_time =
84-
widget::text(if page.battery.remaining_duration > TimeDelta::zero() {
84+
widget::text::body(if page.battery.remaining_duration > TimeDelta::zero() {
8585
&page.battery.remaining_time
8686
} else {
8787
""

‎cosmic-settings/src/pages/sound.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -719,8 +719,8 @@ fn output() -> Section<crate::pages::Message> {
719719
// .descriptions(descriptions)
720720
// .view::<Page>(move |_binder, _page, section| {
721721
// settings::view_section(&section.title)
722-
// .add(settings::item(&section.descriptions[volume], text("TODO")))
723-
// .add(settings::item(&section.descriptions[sound], text("TODO")))
722+
// .add(settings::item(&section.descriptions[volume], text::body("TODO")))
723+
// .add(settings::item(&section.descriptions[sound], text::body("TODO")))
724724
// .into()
725725
// })
726726
// }
@@ -737,7 +737,7 @@ fn output() -> Section<crate::pages::Message> {
737737
// settings::view_section(&section.title)
738738
// .add(settings::item(
739739
// &*section.descriptions[applications],
740-
// text("TODO"),
740+
// text::body("TODO"),
741741
// ))
742742
// .into()
743743
// })

‎cosmic-settings/src/pages/system/about.rs‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,23 +153,29 @@ fn hardware() -> Section<crate::pages::Message> {
153153
let sections = settings::view_section(&section.title)
154154
.add(settings::flex_item(
155155
&*desc[model],
156-
text(&page.info.hardware_model),
156+
text::body(&page.info.hardware_model),
157+
))
158+
.add(settings::flex_item(
159+
&*desc[memory],
160+
text::body(&page.info.memory),
157161
))
158-
.add(settings::flex_item(&*desc[memory], text(&page.info.memory)))
159162
.add(settings::flex_item(
160163
&*desc[processor],
161-
text(&page.info.processor),
164+
text::body(&page.info.processor),
162165
));
163166

164167
page.info
165168
.graphics
166169
.iter()
167170
.fold(sections, |sections, card| {
168-
sections.add(settings::flex_item(&*desc[graphics], text(card.as_str())))
171+
sections.add(settings::flex_item(
172+
&*desc[graphics],
173+
text::body(card.as_str()),
174+
))
169175
})
170176
.add(settings::flex_item(
171177
&*desc[disk_capacity],
172-
text(&page.info.disk_capacity),
178+
text::body(&page.info.disk_capacity),
173179
))
174180
.into()
175181
})
@@ -191,19 +197,19 @@ fn os() -> Section<crate::pages::Message> {
191197
settings::view_section(&section.title)
192198
.add(settings::flex_item(
193199
&*desc[os],
194-
text(&page.info.operating_system),
200+
text::body(&page.info.operating_system),
195201
))
196202
.add(settings::flex_item(
197203
&*desc[os_arch],
198-
text(&page.info.os_architecture),
204+
text::body(&page.info.os_architecture),
199205
))
200206
.add(settings::flex_item(
201207
&*desc[desktop],
202-
text(&page.info.desktop_environment),
208+
text::body(&page.info.desktop_environment),
203209
))
204210
.add(settings::flex_item(
205211
&*desc[windowing_system],
206-
text(&page.info.windowing_system),
212+
text::body(&page.info.windowing_system),
207213
))
208214
.into()
209215
})
@@ -216,7 +222,7 @@ fn os() -> Section<crate::pages::Message> {
216222
// .descriptions(vec![fl!("about-related", "support").into()])
217223
// .view::<Page>(move |_binder, _page, section| {
218224
// settings::view_section(&section.title)
219-
// .add(settings::item(&*section.descriptions[0], text("TODO")))
225+
// .add(settings::item(&*section.descriptions[0], text::body("TODO")))
220226
// .into()
221227
// })
222228
// }

‎cosmic-settings/src/pages/time/date.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ fn date() -> Section<crate::pages::Message> {
380380
.add(
381381
settings::item::builder(&*section.descriptions[title])
382382
.description(fl!("time-date", "auto-ntp"))
383-
.control(widget::text(&page.formatted_date)),
383+
.control(widget::text::body(&page.formatted_date)),
384384
)
385385
.apply(cosmic::Element::from)
386386
.map(crate::pages::Message::DateAndTime)
@@ -452,7 +452,7 @@ fn timezone() -> Section<crate::pages::Message> {
452452
let timezone_context_button = widget::row::with_capacity(2)
453453
.spacing(12)
454454
.push(
455-
widget::text(
455+
widget::text::body(
456456
page.timezone
457457
.map(|id| &*page.timezone_list[id])
458458
.unwrap_or_default(),

0 commit comments

Comments
 (0)