yoda: bump iced submodule + cargo auto-fix sweeps (squashed)
Squash of 6 yoda commits: -282813c8yoda: bump iced -> window_clipboard via public Forgejo fork -cdf34938yoda: cargo fix --lib (libcosmic-yoda) — drop 99 trivial warnings -38a988cbyoda: cargo fix on cosmic-config + bump iced auto-fix commit -301bbf6eyoda: bump iced submodule -> iced_winit warning cleanup (0 left) -b94c03d9yoda: bump iced submodule -> iced_widget cleanup (0 left) -a9492d76yoda: bump iced submodule -> all iced crates at 0 warnings
This commit is contained in:
parent
ba0b06da3c
commit
f9ff7496f3
20 changed files with 58 additions and 68 deletions
|
|
@ -9,7 +9,7 @@
|
|||
use iced_runtime::core::widget::Id;
|
||||
use iced_runtime::{Action, Task, keyboard, task};
|
||||
|
||||
use iced_core::event::{self, Event};
|
||||
use iced_core::event::Event;
|
||||
use iced_core::renderer::{self, Quad, Renderer};
|
||||
use iced_core::widget::Operation;
|
||||
use iced_core::widget::tree::{self, Tree};
|
||||
|
|
@ -662,7 +662,7 @@ impl<'a, Message: 'a + Clone> Widget<Message, crate::Theme, crate::Renderer>
|
|||
height,
|
||||
} = layout.bounds();
|
||||
let bounds = Rect::new(x as f64, y as f64, (x + width) as f64, (y + height) as f64);
|
||||
let is_hovered = state.state.downcast_ref::<State>().is_hovered;
|
||||
let _is_hovered = state.state.downcast_ref::<State>().is_hovered;
|
||||
|
||||
let mut node = Node::new(Role::Button);
|
||||
node.add_action(Action::Focus);
|
||||
|
|
@ -822,7 +822,7 @@ pub fn update<'a, Message: Clone>(
|
|||
}
|
||||
}
|
||||
#[cfg(feature = "a11y")]
|
||||
Event::A11y(event_id, iced_accessibility::accesskit::ActionRequest { action, .. }) => {
|
||||
Event::A11y(_event_id, iced_accessibility::accesskit::ActionRequest { action, .. }) => {
|
||||
let state = state();
|
||||
if let Some(on_press) = matches!(action, iced_accessibility::accesskit::Action::Click)
|
||||
.then_some(on_press)
|
||||
|
|
@ -865,7 +865,7 @@ pub fn draw<Renderer: iced_core::Renderer, Theme>(
|
|||
viewport_bounds: Rectangle,
|
||||
styling: &super::style::Style,
|
||||
draw_contents: impl FnOnce(&mut Renderer, &Style),
|
||||
is_image: bool,
|
||||
_is_image: bool,
|
||||
) where
|
||||
Theme: super::style::Catalog,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ where
|
|||
/// Get an expandable stack of cards
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn new<F, G>(
|
||||
id: widget::Id,
|
||||
_id: widget::Id,
|
||||
card_inner_elements: Vec<Element<'a, Message, crate::Theme, crate::Renderer>>,
|
||||
on_clear_all: Message,
|
||||
on_show_more: Option<F>,
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use crate::widget::segmented_button::Entity;
|
|||
use crate::widget::{container, slider};
|
||||
use derive_setters::Setters;
|
||||
use iced::Task;
|
||||
use iced_core::event::{self, Event};
|
||||
use iced_core::event::Event;
|
||||
use iced_core::gradient::{ColorStop, Linear};
|
||||
use iced_core::renderer::Quad;
|
||||
use iced_core::widget::{Tree, tree};
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ impl<Message: Clone + 'static> ContextMenu<'_, Message> {
|
|||
bounds.x = my_state.context_cursor.x;
|
||||
bounds.y = my_state.context_cursor.y;
|
||||
|
||||
let (id, root_list) = my_state.menu_bar_state.inner.with_data_mut(|state| {
|
||||
let (id, _root_list) = my_state.menu_bar_state.inner.with_data_mut(|state| {
|
||||
if let Some(id) = state.popup_id.get(&self.window_id).copied() {
|
||||
// close existing popups
|
||||
state.menu_states.clear();
|
||||
|
|
@ -147,7 +147,7 @@ impl<Message: Clone + 'static> ContextMenu<'_, Message> {
|
|||
layout.bounds(),
|
||||
-bounds.height,
|
||||
);
|
||||
let (anchor_rect, gravity) = my_state.menu_bar_state.inner.with_data_mut(|state| {
|
||||
let (anchor_rect, _gravity) = my_state.menu_bar_state.inner.with_data_mut(|state| {
|
||||
use iced::Rectangle;
|
||||
|
||||
state.popup_id.insert(self.window_id, id);
|
||||
|
|
|
|||
|
|
@ -8,9 +8,8 @@ use std::sync::{Arc, Mutex};
|
|||
|
||||
pub use appearance::{Appearance, StyleSheet};
|
||||
|
||||
use crate::surface;
|
||||
use crate::widget::{Container, RcWrapper, icon};
|
||||
use iced_core::event::{self, Event};
|
||||
use iced_core::event::Event;
|
||||
use iced_core::layout::{self, Layout};
|
||||
use iced_core::text::{self, Text};
|
||||
use iced_core::widget::Tree;
|
||||
|
|
@ -391,7 +390,7 @@ impl<'a, Message: Clone + 'a> crate::widget::Widget<Message, crate::Theme, crate
|
|||
|
||||
fn draw(
|
||||
&self,
|
||||
tree: &Tree,
|
||||
_tree: &Tree,
|
||||
renderer: &mut crate::Renderer,
|
||||
theme: &crate::Theme,
|
||||
style: &renderer::Style,
|
||||
|
|
@ -554,12 +553,12 @@ where
|
|||
|
||||
fn draw(
|
||||
&self,
|
||||
state: &Tree,
|
||||
_state: &Tree,
|
||||
renderer: &mut crate::Renderer,
|
||||
theme: &crate::Theme,
|
||||
style: &renderer::Style,
|
||||
_style: &renderer::Style,
|
||||
layout: Layout<'_>,
|
||||
cursor: mouse::Cursor,
|
||||
_cursor: mouse::Cursor,
|
||||
viewport: &Rectangle,
|
||||
) {
|
||||
let appearance = theme.appearance(&());
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use super::Model;
|
|||
pub use crate::widget::dropdown::menu::{Appearance, StyleSheet};
|
||||
|
||||
use crate::widget::Container;
|
||||
use iced_core::event::{self, Event};
|
||||
use iced_core::event::Event;
|
||||
use iced_core::layout::{self, Layout};
|
||||
use iced_core::text::{self, Text};
|
||||
use iced_core::widget::Tree;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
use super::menu::{self, Menu};
|
||||
use crate::widget::icon;
|
||||
use derive_setters::Setters;
|
||||
use iced_core::event::{self, Event};
|
||||
use iced_core::event::Event;
|
||||
use iced_core::text::{self, Paragraph, Text};
|
||||
use iced_core::widget::tree::{self, Tree};
|
||||
use iced_core::{
|
||||
|
|
@ -13,7 +13,6 @@ use iced_core::{
|
|||
alignment, keyboard, layout, mouse, overlay, renderer, svg, touch,
|
||||
};
|
||||
use iced_widget::pick_list;
|
||||
use std::ffi::OsStr;
|
||||
|
||||
pub use iced_widget::pick_list::{Catalog, Style};
|
||||
|
||||
|
|
@ -253,7 +252,7 @@ impl<Item: Clone + PartialEq + 'static> Default for State<Item> {
|
|||
/// Computes the layout of a [`Dropdown`].
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn layout(
|
||||
renderer: &crate::Renderer,
|
||||
_renderer: &crate::Renderer,
|
||||
limits: &layout::Limits,
|
||||
width: Length,
|
||||
gap: f32,
|
||||
|
|
@ -376,7 +375,7 @@ pub fn mouse_interaction(layout: Layout<'_>, cursor: mouse::Cursor) -> mouse::In
|
|||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn overlay<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static>(
|
||||
layout: Layout<'_>,
|
||||
renderer: &crate::Renderer,
|
||||
_renderer: &crate::Renderer,
|
||||
state: &'a mut State<Item>,
|
||||
gap: f32,
|
||||
padding: Padding,
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
// SPDX-License-Identifier: MPL-2.0 AND MIT
|
||||
//! Operate on dropdown widgets.
|
||||
|
||||
use super::State;
|
||||
use iced::Rectangle;
|
||||
use iced_core::widget::{Id, Operation};
|
||||
|
||||
pub trait Dropdown {
|
||||
fn close(&mut self);
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ use crate::widget::icon::{self, Handle};
|
|||
use crate::{Element, surface};
|
||||
use derive_setters::Setters;
|
||||
use iced::window;
|
||||
use iced_core::event::{self, Event};
|
||||
use iced_core::event::Event;
|
||||
use iced_core::text::{self, Paragraph, Text};
|
||||
use iced_core::widget::tree::{self, Tree};
|
||||
use iced_core::{
|
||||
|
|
@ -17,7 +17,6 @@ use iced_core::{
|
|||
};
|
||||
use iced_widget::pick_list::{self, Catalog};
|
||||
use std::borrow::Cow;
|
||||
use std::ffi::OsStr;
|
||||
use std::hash::{DefaultHasher, Hash, Hasher};
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::{Arc, LazyLock, Mutex};
|
||||
|
|
@ -328,10 +327,10 @@ where
|
|||
|
||||
fn operate(
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
_tree: &mut Tree,
|
||||
_layout: Layout<'_>,
|
||||
_renderer: &crate::Renderer,
|
||||
operation: &mut dyn iced_core::widget::Operation,
|
||||
_operation: &mut dyn iced_core::widget::Operation,
|
||||
) {
|
||||
// TODO: double check operation handling
|
||||
// let state = tree.state.downcast_mut::<State>();
|
||||
|
|
@ -343,7 +342,7 @@ where
|
|||
tree: &'b mut Tree,
|
||||
layout: Layout<'b>,
|
||||
renderer: &crate::Renderer,
|
||||
viewport: &Rectangle,
|
||||
_viewport: &Rectangle,
|
||||
translation: Vector,
|
||||
) -> Option<overlay::Element<'b, Message, crate::Theme, crate::Renderer>> {
|
||||
#[cfg(all(feature = "wayland", target_os = "linux"))]
|
||||
|
|
@ -452,7 +451,7 @@ impl super::operation::Dropdown for State {
|
|||
/// Computes the layout of a [`Dropdown`].
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn layout(
|
||||
renderer: &crate::Renderer,
|
||||
_renderer: &crate::Renderer,
|
||||
limits: &layout::Limits,
|
||||
width: Length,
|
||||
gap: f32,
|
||||
|
|
@ -546,7 +545,7 @@ pub fn update<
|
|||
cursor: mouse::Cursor,
|
||||
shell: &mut Shell<'_, Message>,
|
||||
#[cfg(all(feature = "wayland", target_os = "linux"))]
|
||||
positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
|
||||
_positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
|
||||
on_selected: Arc<dyn Fn(usize) -> Message + Send + Sync + 'static>,
|
||||
selected: Option<usize>,
|
||||
selections: &[S],
|
||||
|
|
@ -558,7 +557,7 @@ pub fn update<
|
|||
gap: f32,
|
||||
padding: Padding,
|
||||
text_size: Option<f32>,
|
||||
font: Option<crate::font::Font>,
|
||||
_font: Option<crate::font::Font>,
|
||||
selected_option: Option<usize>,
|
||||
) {
|
||||
let state = state();
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
use crate::{Element, Renderer};
|
||||
use derive_setters::Setters;
|
||||
use iced_core::event::{self, Event};
|
||||
use iced_core::event::Event;
|
||||
use iced_core::widget::{Operation, Tree};
|
||||
use iced_core::{
|
||||
Clipboard, Layout, Length, Padding, Rectangle, Shell, Vector, Widget, layout, mouse, overlay,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
use crate::{Element, Renderer};
|
||||
use derive_setters::Setters;
|
||||
use iced_core::event::{self, Event};
|
||||
use iced_core::event::Event;
|
||||
use iced_core::widget::{Operation, Tree};
|
||||
use iced_core::{
|
||||
Alignment, Clipboard, Layout, Length, Padding, Rectangle, Shell, Vector, Widget, layout, mouse,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
/// Icon bundling is not enabled on unix platforms.
|
||||
#[cfg(all(unix, not(target_os = "macos")))]
|
||||
pub fn get(icon_name: &str) -> Option<super::Data> {
|
||||
pub fn get(_icon_name: &str) -> Option<super::Data> {
|
||||
None
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -119,8 +119,6 @@ pub mod calendar;
|
|||
pub use calendar::{Calendar, calendar};
|
||||
|
||||
pub mod card;
|
||||
#[doc(inline)]
|
||||
pub use card::*;
|
||||
|
||||
pub mod color_picker;
|
||||
#[doc(inline)]
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@ use apply::Apply;
|
|||
use iced::Limits;
|
||||
use iced::clipboard::dnd::{DndAction, DndEvent, OfferEvent, SourceEvent};
|
||||
use iced::clipboard::mime::AsMimeTypes;
|
||||
use iced_core::event::{self, Event};
|
||||
use iced_core::event::Event;
|
||||
use iced_core::input_method::{self, InputMethod, Preedit};
|
||||
use iced_core::mouse::{self, click};
|
||||
use iced_core::overlay::Group;
|
||||
use iced_core::renderer::{self, Renderer as CoreRenderer};
|
||||
use iced_core::text::{self, Affinity, Paragraph, Renderer, Text};
|
||||
use iced_core::text::{self, Paragraph, Renderer, Text};
|
||||
use iced_core::time::{Duration, Instant};
|
||||
use iced_core::widget::Id;
|
||||
use iced_core::widget::operation::{self, Operation};
|
||||
|
|
@ -825,7 +825,7 @@ where
|
|||
&mut self,
|
||||
tree: &mut Tree,
|
||||
layout: Layout<'_>,
|
||||
renderer: &crate::Renderer,
|
||||
_renderer: &crate::Renderer,
|
||||
operation: &mut dyn Operation,
|
||||
) {
|
||||
operation.container(Some(&self.id), layout.bounds());
|
||||
|
|
@ -917,7 +917,7 @@ where
|
|||
// Enable custom buttons defined on the trailing icon position to be handled.
|
||||
if !self.is_editable_variant {
|
||||
if let Some(trailing_layout) = trailing_icon_layout {
|
||||
let res = trailing_icon.as_widget_mut().update(
|
||||
let _res = trailing_icon.as_widget_mut().update(
|
||||
tree,
|
||||
event,
|
||||
trailing_layout,
|
||||
|
|
@ -2216,7 +2216,7 @@ pub fn update<'a, Message: Clone + 'static>(
|
|||
)) if *rectangle == Some(dnd_id) => {
|
||||
cold();
|
||||
let state = state();
|
||||
let is_clicked = text_layout.bounds().contains(Point {
|
||||
let _is_clicked = text_layout.bounds().contains(Point {
|
||||
x: *x as f32,
|
||||
y: *y as f32,
|
||||
});
|
||||
|
|
@ -2224,7 +2224,7 @@ pub fn update<'a, Message: Clone + 'static>(
|
|||
let mut accepted = false;
|
||||
for m in mime_types {
|
||||
if SUPPORTED_TEXT_MIME_TYPES.contains(&m.as_str()) {
|
||||
let clone = m.clone();
|
||||
let _clone = m.clone();
|
||||
accepted = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -2287,7 +2287,7 @@ pub fn update<'a, Message: Clone + 'static>(
|
|||
cold();
|
||||
let state = state();
|
||||
if let DndOfferState::HandlingOffer(mime_types, _action) = state.dnd_offer.clone() {
|
||||
let Some(mime_type) = SUPPORTED_TEXT_MIME_TYPES
|
||||
let Some(_mime_type) = SUPPORTED_TEXT_MIME_TYPES
|
||||
.iter()
|
||||
.find(|&&m| mime_types.iter().any(|t| t == m))
|
||||
else {
|
||||
|
|
@ -2304,7 +2304,7 @@ pub fn update<'a, Message: Clone + 'static>(
|
|||
Event::Dnd(DndEvent::Offer(id, OfferEvent::LeaveDestination)) if Some(dnd_id) != *id => {}
|
||||
#[cfg(all(feature = "wayland", target_os = "linux"))]
|
||||
Event::Dnd(DndEvent::Offer(
|
||||
rectangle,
|
||||
_rectangle,
|
||||
OfferEvent::Leave | OfferEvent::LeaveDestination,
|
||||
)) => {
|
||||
cold();
|
||||
|
|
@ -2607,7 +2607,7 @@ pub fn draw<'a, Message>(
|
|||
let handling_dnd_offer = !matches!(state.dnd_offer, DndOfferState::None);
|
||||
#[cfg(not(all(feature = "wayland", target_os = "linux")))]
|
||||
let handling_dnd_offer = false;
|
||||
let (cursors, offset, is_selecting) = if let Some(focus) =
|
||||
let (cursors, offset, _is_selecting) = if let Some(focus) =
|
||||
state.is_focused.filter(|f| f.focused).or_else(|| {
|
||||
let now = Instant::now();
|
||||
handling_dnd_offer.then_some(Focus {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue