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

improv: use the new menu column widget

Browse source
This commit is contained in:
Ashley Wulber 2026-07-08 18:27:28 -04:00 • committed by Jacob Kauffmann
parent 6a19629f15
commit 05f09fe33c
3 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/common.rs
View file

@ -388,7 +388,12 @@ impl<M: From<Message> + Send + 'static> Common<M> {
let mut other = *other_rect; let mut other = *other_rect;
other.x += x; other.x += x;
other.y += y; other.y += y;
let rad = CornerRadius {
top_left: 8,
top_right: 8,
bottom_left: 8,
bottom_right: 8,
};
rects.append(&mut rounded_rect_strips(other, rad)); rects.append(&mut rounded_rect_strips(other, rad));
} }

5
src/greeter.rs
View file

@ -24,7 +24,8 @@ use cosmic::iced::platform_specific::shell::wayland::commands::subsurface::repos
use cosmic::iced::runtime::core::window::Id as SurfaceId; use cosmic::iced::runtime::core::window::Id as SurfaceId;
use cosmic::iced::runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings; use cosmic::iced::runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings;
use cosmic::iced::{ use cosmic::iced::{
self, Alignment, Background, Border, Length, Point, Rectangle, Size, Subscription, window, self, Alignment, Background, Border, Color, Length, Point, Rectangle, Size, Subscription,
window,
}; };
use cosmic::widget::{id_container, text}; use cosmic::widget::{id_container, text};
use cosmic::{Element, executor, surface, theme, widget}; use cosmic::{Element, executor, surface, theme, widget};
@ -537,7 +538,7 @@ impl App {
let dropdown_menu = |items: Vec<_>| { let dropdown_menu = |items: Vec<_>| {
let item_cnt = items.len(); let item_cnt = items.len();
let items = widget::column::with_children(items); let items = widget::menu::menu_column::MenuColumn::with_children(items);
let items = if item_cnt > 7 { let items = if item_cnt > 7 {
Element::from( Element::from(
widget::scrollable(items) widget::scrollable(items)

42
src/locker.rs
View file

@ -14,7 +14,6 @@ use cosmic::iced::runtime::platform_specific::wayland::subsurface::SctkSubsurfac
use cosmic::iced::{ use cosmic::iced::{
self, Alignment, Background, Border, Length, Point, Rectangle, Size, Subscription, self, Alignment, Background, Border, Length, Point, Rectangle, Size, Subscription,
}; };
use cosmic::widget::indeterminate_circular;
use cosmic::{Element, executor, surface, theme, widget}; use cosmic::{Element, executor, surface, theme, widget};
use cosmic_config::CosmicConfigEntry; use cosmic_config::CosmicConfigEntry;
use cosmic_greeter_daemon::{TimeAppletConfig, UserData}; use cosmic_greeter_daemon::{TimeAppletConfig, UserData};
@ -373,7 +372,7 @@ impl App {
let dropdown_menu = |items: Vec<_>| { let dropdown_menu = |items: Vec<_>| {
let item_cnt = items.len(); let item_cnt = items.len();
let items = widget::column::with_children(items); let items = widget::menu::menu_column::MenuColumn::with_children(items);
let items = if item_cnt > 7 { let items = if item_cnt > 7 {
Element::from( Element::from(
widget::scrollable(items) widget::scrollable(items)
@ -383,25 +382,26 @@ impl App {
Element::from(items) Element::from(items)
}; };
let menu = widget::container(items) let menu: widget::Container<'_, Message, cosmic::prelude::Theme> =
.padding(1) widget::container(items)
//TODO: move style to libcosmic .padding(1)
.class(theme::Container::custom(|theme| { //TODO: move style to libcosmic
let cosmic = theme.cosmic(); .class(theme::Container::custom(|theme| {
let component = &cosmic.background(theme.transparent).component; let cosmic = theme.cosmic();
widget::container::Style { let component = &cosmic.background(theme.transparent).component;
icon_color: Some(component.on.into()), widget::container::Style {
text_color: Some(component.on.into()), icon_color: Some(component.on.into()),
background: Some(Background::Color(component.base.into())), text_color: Some(component.on.into()),
border: Border { background: Some(Background::Color(component.base.into())),
radius: 8.0.into(), border: Border {
width: 1.0, radius: 8.0.into(),
color: component.divider.into(), width: 1.0,
}, color: component.divider.into(),
..Default::default() },
} ..Default::default()
})) }
.width(Length::Fixed(240.0)); }))
.width(Length::Fixed(240.0));
if let Some(t) = self.common.rectangle_tracker.as_ref() { if let Some(t) = self.common.rectangle_tracker.as_ref() {
Element::from(t.container((surface_id, true), menu)) Element::from(t.container((surface_id, true), menu))