Fix compilation without wayland feature and add feature testing to CI
This commit is contained in:
parent
29a1f7f518
commit
15b748bf3a
2 changed files with 4 additions and 0 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
|
@ -17,4 +17,6 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- run: sudo apt-get update; sudo apt-get install libclang-dev libglib2.0-dev libxkbcommon-dev
|
||||
- run: rustup update stable && rustup default stable
|
||||
- run: cargo test --verbose --no-default-features
|
||||
- run: cargo test --verbose
|
||||
- run: cargo test --verbose --all-features
|
||||
|
|
|
|||
|
|
@ -369,6 +369,7 @@ impl<M: Send + 'static> Dialog<M> {
|
|||
.map(DialogMessage)
|
||||
.map(move |message| cosmic::action::app(mapper(message)));
|
||||
if let Some(result) = self.cosmic.app.result_opt.take() {
|
||||
#[cfg(feature = "wayland")]
|
||||
if !self.cosmic.surface_views.is_empty() {
|
||||
log::debug!("waiting for surfaces to close...");
|
||||
let mut tasks = Vec::new();
|
||||
|
|
@ -426,6 +427,7 @@ impl<M: Send + 'static> Dialog<M> {
|
|||
self.cosmic.app.flags.window_id
|
||||
}
|
||||
|
||||
#[cfg(feature = "wayland")]
|
||||
pub fn contains_surface(&self, id: &window::Id) -> bool {
|
||||
self.cosmic.surface_views.contains_key(id)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue