fix(test): --features applet only
fix(test): `--feature wayland` only
This commit is contained in:
parent
a70feab2bf
commit
8b31e83d58
4 changed files with 6 additions and 6 deletions
|
|
@ -290,7 +290,7 @@ impl Context {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn applet_tooltip<'a, Message: 'static>(
|
pub fn applet_tooltip<'a, Message: Clone + 'static>(
|
||||||
&self,
|
&self,
|
||||||
content: impl Into<Element<'a, Message>>,
|
content: impl Into<Element<'a, Message>>,
|
||||||
tooltip: impl Into<Cow<'static, str>>,
|
tooltip: impl Into<Cow<'static, str>>,
|
||||||
|
|
@ -502,7 +502,7 @@ impl Context {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn text<'a>(&self, msg: impl Into<Cow<'a, str>>) -> crate::widget::Text<'a, crate::Theme> {
|
pub fn text<'a>(&self, msg: impl Into<Cow<'a, str>>) -> crate::widget::Text<'a> {
|
||||||
let msg = msg.into();
|
let msg = msg.into();
|
||||||
let t = match self.size {
|
let t = match self.size {
|
||||||
Size::Hardcoded(_) => crate::widget::text,
|
Size::Hardcoded(_) => crate::widget::text,
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ impl<'a> Text<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn uses_popup_context_menu(&self) -> bool {
|
fn uses_popup_context_menu(&self) -> bool {
|
||||||
#[cfg(feature = "wayland")]
|
#[cfg(all(feature = "wayland", feature = "winit"))]
|
||||||
if matches!(
|
if matches!(
|
||||||
crate::app::cosmic::WINDOWING_SYSTEM.get(),
|
crate::app::cosmic::WINDOWING_SYSTEM.get(),
|
||||||
Some(crate::app::cosmic::WindowingSystem::Wayland)
|
Some(crate::app::cosmic::WindowingSystem::Wayland)
|
||||||
|
|
|
||||||
|
|
@ -130,7 +130,7 @@ impl<'a, Message: Clone + 'static> TextEditor<'a, Message> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn uses_popup_context_menu(&self) -> bool {
|
fn uses_popup_context_menu(&self) -> bool {
|
||||||
#[cfg(feature = "wayland")]
|
#[cfg(all(feature = "wayland", feature = "winit"))]
|
||||||
if matches!(
|
if matches!(
|
||||||
crate::app::cosmic::WINDOWING_SYSTEM.get(),
|
crate::app::cosmic::WINDOWING_SYSTEM.get(),
|
||||||
Some(crate::app::cosmic::WindowingSystem::Wayland)
|
Some(crate::app::cosmic::WindowingSystem::Wayland)
|
||||||
|
|
|
||||||
|
|
@ -585,7 +585,7 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
fn uses_popup_context_menu(&self) -> bool {
|
fn uses_popup_context_menu(&self) -> bool {
|
||||||
#[cfg(feature = "wayland")]
|
#[cfg(all(feature = "wayland", feature = "winit"))]
|
||||||
if matches!(
|
if matches!(
|
||||||
crate::app::cosmic::WINDOWING_SYSTEM.get(),
|
crate::app::cosmic::WINDOWING_SYSTEM.get(),
|
||||||
Some(crate::app::cosmic::WindowingSystem::Wayland)
|
Some(crate::app::cosmic::WindowingSystem::Wayland)
|
||||||
|
|
@ -1030,7 +1030,7 @@ where
|
||||||
);
|
);
|
||||||
|
|
||||||
// On Wayland: if right-click just set context_menu_position, create a popup instead.
|
// On Wayland: if right-click just set context_menu_position, create a popup instead.
|
||||||
#[cfg(feature = "wayland")]
|
#[cfg(all(feature = "wayland", feature = "winit"))]
|
||||||
if matches!(
|
if matches!(
|
||||||
crate::app::cosmic::WINDOWING_SYSTEM.get(),
|
crate::app::cosmic::WINDOWING_SYSTEM.get(),
|
||||||
Some(crate::app::cosmic::WindowingSystem::Wayland)
|
Some(crate::app::cosmic::WindowingSystem::Wayland)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue