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

Update libcosmic/iced

Browse source
This commit is contained in:
Ian Douglas Scott 2023-12-04 16:58:51 -08:00
parent 5a452d7ac1
commit ed1b1d8f1c
3 changed files with 230 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

460
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

8
app/src/app.rs
View file

@ -22,7 +22,11 @@ use cosmic::iced::Subscription;
use cosmic::{ use cosmic::{
app::{Command, Core}, app::{Command, Core},
cosmic_config::config_subscription, cosmic_config::config_subscription,
iced::{self, event::wayland, event::PlatformSpecific, subscription, window, Length}, iced::{
self,
event::{self, wayland, PlatformSpecific},
window, Length,
},
prelude::*, prelude::*,
widget::{ widget::{
column, container, icon, nav_bar, navigation, scrollable, search, segmented_button, column, container, icon, nav_bar, navigation, scrollable, search, segmented_button,
@ -167,7 +171,7 @@ impl cosmic::Application for SettingsApp {
} }
fn subscription(&self) -> Subscription<Message> { fn subscription(&self) -> Subscription<Message> {
let window_break = subscription::events_with(|event, _| match event { let window_break = event::listen_with(|event, _| match event {
iced::Event::PlatformSpecific(PlatformSpecific::Wayland(wayland::Event::Output( iced::Event::PlatformSpecific(PlatformSpecific::Wayland(wayland::Event::Output(
wayland::OutputEvent::Created(Some(info)), wayland::OutputEvent::Created(Some(info)),
o, o,

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

@ -312,7 +312,7 @@ impl Page {
scrollable( scrollable(
column::with_children(vec![ column::with_children(vec![
text(fl!("add-applet")).size(24).width(Length::Fill).into(), text(fl!("add-applet")).size(24).width(Length::Fill).into(),
text_input::search_input(&fl!("search-applets"), &self.search) text_input::search_input(fl!("search-applets"), &self.search)
.on_input(move |s| { .on_input(move |s| {
app::Message::PageMessage(msg_map(Message::Search(s))) app::Message::PageMessage(msg_map(Message::Search(s)))
}) })
@ -946,8 +946,13 @@ where
Length::Shrink Length::Shrink
} }
fn layout(&self, renderer: &cosmic::Renderer, limits: &layout::Limits) -> layout::Node { fn layout(
let inner_layout = self.inner.as_widget().layout(renderer, limits); &self,
tree: &mut Tree,
renderer: &cosmic::Renderer,
limits: &layout::Limits,
) -> layout::Node {
let inner_layout = self.inner.as_widget().layout(tree, renderer, limits);
layout::Node::with_children(inner_layout.size(), vec![inner_layout]) layout::Node::with_children(inner_layout.size(), vec![inner_layout])
} }