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

feat!: implement Application API

Browse source
This commit is contained in:
Michael Murphy 2023-08-02 11:54:07 +02:00 • committed by GitHub
parent e24465ba37
commit a223b60a0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 1420 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

9
examples/cosmic-sctk/src/main.rs
View file

@ -1,14 +1,11 @@
use cosmic::{
iced::{wayland::InitialSurface, Application},
settings,
};
use cosmic::iced::{wayland::InitialSurface, Application, Settings};
mod window;
pub use window::Window;
pub fn main() -> cosmic::iced::Result {
settings::set_default_icon_theme("Pop");
let mut settings = settings();
cosmic::icon_theme::set_default("Pop");
let mut settings = Settings::default();
settings.initial_surface = InitialSurface::XdgWindow(Default::default());
Window::run(settings)
}

11
examples/cosmic-sctk/src/window.rs
View file

@ -6,7 +6,7 @@ use cosmic::{
iced::{
wayland::window::{start_drag_window, toggle_maximize},
widget::{column, container, horizontal_space, pick_list, progress_bar, row, slider},
window, Color, Event,
window, Color,
},
iced_futures::Subscription,
iced_style::application,
@ -15,7 +15,7 @@ use cosmic::{
widget::{
button, cosmic_container, header_bar, nav_bar, nav_bar_toggle,
rectangle_tracker::{rectangle_tracker_subscription, RectangleTracker, RectangleUpdate},
scrollable, segmented_button, segmented_selection, settings, toggler, IconSource,
scrollable, segmented_button, segmented_selection, settings, IconSource,
},
Element, ElementExt,
};
@ -336,9 +336,8 @@ impl Application for Window {
.on_drag(Message::Drag)
.start(
nav_bar_toggle()
.on_nav_bar_toggled(nav_bar_message)
.nav_bar_active(nav_bar_toggled)
.into(),
.on_toggle(nav_bar_message)
.active(nav_bar_toggled),
);
if self.show_maximize {
@ -509,7 +508,7 @@ impl Application for Window {
self.theme.clone()
}
fn close_requested(&self, id: window::Id) -> Self::Message {
fn close_requested(&self, _id: window::Id) -> Self::Message {
Message::Close
}
fn subscription(&self) -> iced::Subscription<Self::Message> {