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

Update libcosmic/iced for advanced text rebase

Browse source
This commit is contained in:
Ian Douglas Scott 2023-05-12 13:26:44 -07:00 • committed by Michael Aaron Murphy
parent 33df250f35
commit b6336acbfb
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
6 changed files with 1114 additions and 815 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/app.rs
View file

@ -7,9 +7,8 @@ use cosmic_settings_page::{self as page, section};
use cosmic::{
iced::widget::{self, column, container, horizontal_space, row},
iced::{self, Application, Command, Length, Subscription},
iced_native::{subscription, window},
iced_winit::window::{close, drag, minimize, toggle_maximize},
iced::{self, subscription, window, Application, Command, Length, Subscription},
iced_runtime::window::{close, drag, minimize, toggle_maximize},
keyboard_nav,
theme::Theme,
widget::{
@ -172,10 +171,10 @@ impl Application for SettingsApp {
}
},
Message::Page(page) => return self.activate_page(page),
Message::Drag => return drag(window::Id::new(0)),
Message::Close => return close(window::Id::new(0)),
Message::Minimize => return minimize(window::Id::new(0), true),
Message::Maximize => return toggle_maximize(window::Id::new(0)),
Message::Drag => return drag(),
Message::Close => return close(),
Message::Minimize => return minimize(true),
Message::Maximize => return toggle_maximize(),
Message::NavBar(key) => {
if let Some(page) = self.nav_bar.data::<page::Entity>(key).copied() {
return self.activate_page(page);