leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better surface messages

Browse source
This commit is contained in:
Ashley Wulber 2024-12-31 17:18:49 -05:00
parent 681aed735b
commit b316d8901b
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
4 changed files with 256 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

164
examples/applet/src/window.rs
View file

@ -1,5 +1,6 @@
use std::sync::{Arc, Mutex};
use cosmic::app::message::{SurfaceMessage, SurfaceMessageHandler};
use cosmic::app::Core;
use cosmic::iced::application;
use cosmic::iced::platform_specific::shell::commands::popup::{destroy_popup, get_popup};
@ -23,11 +24,24 @@ pub struct Window {
#[derive(Clone, Debug)]
pub enum Message {
TogglePopup,
PopupClosed(Id),
ToggleExampleRow(bool),
Hover,
Leave,
Surface(SurfaceMessage),
}
impl SurfaceMessageHandler for Message {
fn to_surface_message(self) -> cosmic::app::message::MessageWrapper<Self> {
match self {
Message::Surface(msg) => cosmic::app::message::MessageWrapper::Surface(msg),
msg => cosmic::app::message::MessageWrapper::Message(msg),
}
}
}
impl From<SurfaceMessage> for Message {
fn from(value: SurfaceMessage) -> Self {
Message::Surface(value)
}
}
impl cosmic::Application for Window {
@ -58,61 +72,6 @@ impl cosmic::Application for Window {
fn update(&mut self, message: Self::Message) -> Task<cosmic::app::Message<Self::Message>> {
match message {
Message::TogglePopup => {
return if let Some(p) = self.popup.take() {
cosmic::task::message(cosmic::app::message::destroy_popup(p))
} else {
cosmic::task::message(
cosmic::app::message::get_popup(
|state: &mut Window| {
let new_id = Id::unique();
state.popup = Some(new_id);
let mut popup_settings = state.core.applet.get_popup_settings(
state.core.main_window_id().unwrap(),
new_id,
None,
None,
None,
);
popup_settings.positioner.size_limits = Limits::NONE
.max_width(372.0)
.min_width(300.0)
.min_height(200.0)
.max_height(1080.0)
.height(500)
.width(500);
popup_settings.positioner.size = Some((500, 500));
popup_settings
},
Some(
move |state: &Window| -> cosmic::Element<
'static,
cosmic::app::Message<Message>,
> {
{
let content_list = list_column().padding(5).spacing(0).add(
settings::item(
"Example row",
cosmic::widget::container(
toggler(state.example_row).on_toggle(|value| {
Message::ToggleExampleRow(value)
}),
)
.height(Length::Fixed(50.)),
),
);
Element::from(
state.core.applet.popup_container(content_list),
)
.map(cosmic::app::Message::App)
}
},
),
),
)
};
}
Message::PopupClosed(id) => {
if self.popup.as_ref() == Some(&id) {
self.popup = None;
@ -121,8 +80,69 @@ impl cosmic::Application for Window {
Message::ToggleExampleRow(toggled) => {
self.example_row = toggled;
}
Message::Hover => {
return cosmic::task::message(cosmic::app::message::get_subsurface(
Message::Surface(surface_message) => {}
}
Task::none()
}
fn view(&self) -> Element<Self::Message> {
cosmic::widget::wayland::tooltip::widget::Tooltip::new(
self.core.applet.icon_button("display-symbolic").on_press(
if let Some(id) = self.popup {
cosmic::app::message::destroy_popup::<Window>(id)
} else {
cosmic::app::message::get_popup::<Window>(
|state: &mut Window| {
let new_id = Id::unique();
state.popup = Some(new_id);
let mut popup_settings = state.core.applet.get_popup_settings(
state.core.main_window_id().unwrap(),
new_id,
None,
None,
None,
);
popup_settings.positioner.size_limits = Limits::NONE
.max_width(372.0)
.min_width(300.0)
.min_height(200.0)
.max_height(1080.0)
.height(500)
.width(500);
popup_settings.positioner.size = Some((500, 500));
popup_settings
},
Some(
move |state: &Window| -> cosmic::Element<
'static,
cosmic::app::Message<Message>,
> {
{
let content_list = list_column().padding(5).spacing(0).add(
settings::item(
"Example row",
cosmic::widget::container(
toggler(state.example_row).on_toggle(|value| {
Message::ToggleExampleRow(value)
}),
)
.height(Length::Fixed(50.)),
),
);
Element::from(
state.core.applet.popup_container(content_list),
)
.map(cosmic::app::Message::App)
}
},
),
)
},
),
|layout| {
cosmic::app::message::get_subsurface::<Window>(
|app: &mut Window| {
let id = window::Id::unique();
app.subsurface_id = Some(id);
@ -136,25 +156,11 @@ impl cosmic::Application for Window {
}
},
Some(|app: &Window| layer_container(cosmic::widget::text("hello")).into()),
));
}
Message::Leave => {
return cosmic::task::message(cosmic::app::message::destroy_subsurface(
self.subsurface_id.unwrap_or(window::Id::NONE),
));
}
}
Task::none()
}
fn view(&self) -> Element<Self::Message> {
cosmic::widget::wayland::tooltip::widget::Tooltip::new(
self.core
.applet
.icon_button("display-symbolic")
.on_press(Message::TogglePopup),
|layout| Message::Hover,
Message::Leave,
)
},
cosmic::app::message::destroy_subsurface::<Window>(
self.subsurface_id.unwrap_or(window::Id::NONE),
),
)
.into()
}