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

fix: avoid accidentally triggering vendoring of iced_winit when not used (#238)

Browse source
This commit is contained in:
Ashley Wulber 2023-12-11 12:59:13 -05:00 • committed by GitHub
parent 74ee508427
commit 493bf6c47a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/app/mod.rs
View file

@ -499,10 +499,10 @@ pub trait ApplicationExt: Application {
fn minimize(&mut self) -> iced::Command<Message<Self::Message>>;
/// Get the title of the main window.
#[cfg(not(feature = "multi-window"))]
#[cfg(not(any(feature = "multi-window", feature = "wayland")))]
fn title(&self) -> &str;
#[cfg(feature = "multi-window")]
#[cfg(any(feature = "multi-window", feature = "wayland"))]
/// Get the title of a window.
fn title(&self, id: window::Id) -> &str;
@ -516,11 +516,11 @@ pub trait ApplicationExt: Application {
self.core_mut().set_header_title(title);
}
#[cfg(not(feature = "multi-window"))]
#[cfg(not(any(feature = "multi-window", feature = "wayland")))]
/// Set the title of the main window.
fn set_window_title(&mut self, title: String) -> iced::Command<Message<Self::Message>>;
#[cfg(feature = "multi-window")]
#[cfg(any(feature = "multi-window", feature = "wayland"))]
/// Set the title of a window.
fn set_window_title(
&mut self,
@ -545,17 +545,17 @@ impl<App: Application> ApplicationExt for App {
command::minimize(Some(window::Id::MAIN))
}
#[cfg(feature = "multi-window")]
#[cfg(any(feature = "multi-window", feature = "wayland"))]
fn title(&self, id: window::Id) -> &str {
self.core().title.get(&id).map(|s| s.as_str()).unwrap_or("")
}
#[cfg(not(feature = "multi-window"))]
#[cfg(not(any(feature = "multi-window", feature = "wayland")))]
fn title(&self) -> &str {
&self.core().window.header_title
}
#[cfg(feature = "multi-window")]
#[cfg(any(feature = "multi-window", feature = "wayland"))]
fn set_window_title(
&mut self,
title: String,
@ -565,7 +565,7 @@ impl<App: Application> ApplicationExt for App {
command::set_title(Some(id), title)
}
#[cfg(not(feature = "multi-window"))]
#[cfg(not(any(feature = "multi-window", feature = "wayland")))]
fn set_window_title(&mut self, title: String) -> iced::Command<Message<Self::Message>> {
self.core_mut()
.title