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

Do not panic if active_layouts is empty, fixes #550

Browse source
This commit is contained in:
Jeremy Soller 2026-09-26 16:39:44 -06:00
parent 8637169d9e
commit bfb2745176
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/greeter.rs
View file

@ -604,7 +604,11 @@ impl App {
widget::container( widget::container(
widget::button::custom( widget::button::custom(
widget::text( widget::text(
self.common.active_layouts[self.common.current_keyboard_layout].name(), self.common
.active_layouts
.get(self.common.current_keyboard_layout)
.map(|x| x.name())
.unwrap_or_default(),
) )
.ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1))) .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1)))
.height(16) .height(16)

6
src/locker.rs
View file

@ -421,7 +421,11 @@ impl App {
widget::container( widget::container(
widget::button::custom( widget::button::custom(
widget::text( widget::text(
self.common.active_layouts[self.common.current_keyboard_layout].name(), self.common
.active_layouts
.get(self.common.current_keyboard_layout)
.map(|x| x.name())
.unwrap_or_default(),
) )
.ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1))) .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1)))
.height(16) .height(16)