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

fix: use latest iced & commit hash for sctk

Browse source
This commit is contained in:
Ashley Wulber 2022-12-13 10:18:07 -05:00 • committed by Jeremy Soller
parent 91e826d8ea
commit d888f2bd3b
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -21,7 +21,7 @@ derive_setters = "0.1.5"
lazy_static = "1.4.0" lazy_static = "1.4.0"
palette = "0.6.1" palette = "0.6.1"
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", default-features = false, optional = true } cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", default-features = false, optional = true }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", optional = true } sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", optional = true, rev = "f1d9c3e" }
[dependencies.cosmic-theme] [dependencies.cosmic-theme]
git = "https://github.com/pop-os/cosmic-theme.git" git = "https://github.com/pop-os/cosmic-theme.git"

2
examples/cosmic-sctk/Cargo.toml
View file

@ -7,4 +7,4 @@ publish = false
[dependencies] [dependencies]
libcosmic = { path = "../..", default-features = false, features = ["debug", "wayland"] } libcosmic = { path = "../..", default-features = false, features = ["debug", "wayland"] }
iced_sctk = { git = "https://github.com/pop-os/iced-sctk" } # iced_sctk = { git = "https://github.com/pop-os/iced-sctk" }

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

@ -2,18 +2,16 @@
// SPDX-License-Identifier: MPL-2.0 // SPDX-License-Identifier: MPL-2.0
use cosmic::{ use cosmic::{
iced_native::window,
iced::widget::{ iced::widget::{
column, container, horizontal_space, pick_list, progress_bar, radio, row, slider, column, container, horizontal_space, pick_list, progress_bar, radio, row, slider,
}, },
iced::{self, Alignment, Application, Command, Length}, iced::{self, Alignment, Application, Command, Length, wayland::SurfaceIdWrapper},
iced_lazy::responsive, iced_lazy::responsive,
theme::{self, Theme}, theme::{self, Theme},
widget::{button, nav_button, nav_bar, nav_bar_page, nav_bar_section, header_bar, settings, scrollable, toggler}, widget::{button, nav_button, nav_bar, nav_bar_page, nav_bar_section, header_bar, settings, scrollable, toggler},
Element, Element,
ElementExt, ElementExt,
}; };
use iced_sctk::application::SurfaceIdWrapper;
use std::{collections::BTreeMap, vec}; use std::{collections::BTreeMap, vec};
use theme::Button as ButtonTheme; use theme::Button as ButtonTheme;
@ -326,7 +324,7 @@ impl Application for Window {
self.theme self.theme
} }
fn close_requested(&self, id: iced_sctk::application::SurfaceIdWrapper) -> Self::Message { fn close_requested(&self, id: SurfaceIdWrapper) -> Self::Message {
Message::Close Message::Close
} }
} }