chore: update libcosmic after reexports were removed
This commit is contained in:
parent
828534ad9c
commit
240bb058a9
7 changed files with 328 additions and 385 deletions
659
Cargo.lock
generated
659
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -12,7 +12,7 @@ use cosmic::{
|
|||
cosmic_protocols::toplevel_management::v1::client::zcosmic_toplevel_manager_v1,
|
||||
wayland_client::protocol::wl_output,
|
||||
},
|
||||
iced_winit::platform_specific::wayland::subsurface_widget::SubsurfaceBuffer,
|
||||
iced::platform_specific::shell::subsurface_widget::SubsurfaceBuffer,
|
||||
};
|
||||
use std::collections::HashSet;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,7 @@ use cctk::{
|
|||
};
|
||||
use cosmic::{
|
||||
cctk,
|
||||
iced_winit::platform_specific::wayland::subsurface_widget::{
|
||||
BufferSource, Dmabuf, Plane, Shmbuf,
|
||||
},
|
||||
iced::platform_specific::shell::subsurface_widget::{BufferSource, Dmabuf, Plane, Shmbuf},
|
||||
};
|
||||
use std::{os::fd::AsFd, sync::Arc};
|
||||
use wayland_protocols::wp::linux_dmabuf::zv1::client::zwp_linux_buffer_params_v1;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ use cosmic::{
|
|||
},
|
||||
wayland_client::{Connection, QueueHandle, WEnum},
|
||||
},
|
||||
iced_winit::platform_specific::wayland::subsurface_widget::{
|
||||
iced::platform_specific::shell::subsurface_widget::{
|
||||
SubsurfaceBuffer, SubsurfaceBufferRelease,
|
||||
},
|
||||
};
|
||||
|
|
|
|||
14
src/main.rs
14
src/main.rs
|
|
@ -16,6 +16,13 @@ use clap::Parser;
|
|||
use cosmic::{
|
||||
app::{Application, CosmicFlags},
|
||||
cctk, dbus_activation,
|
||||
iced::platform_specific::shell::commands::layer_surface::{
|
||||
destroy_layer_surface, get_layer_surface,
|
||||
},
|
||||
iced::runtime::platform_specific::wayland::layer_surface::{
|
||||
IcedOutput, SctkLayerSurfaceSettings,
|
||||
},
|
||||
iced::window::Id as SurfaceId,
|
||||
iced::{
|
||||
self, Size, Subscription, Task,
|
||||
clipboard::dnd::{DndEvent, SourceEvent},
|
||||
|
|
@ -23,13 +30,6 @@ use cosmic::{
|
|||
keyboard::key::{Key, Named},
|
||||
mouse::ScrollDelta,
|
||||
},
|
||||
iced_core::window::Id as SurfaceId,
|
||||
iced_runtime::platform_specific::wayland::layer_surface::{
|
||||
IcedOutput, SctkLayerSurfaceSettings,
|
||||
},
|
||||
iced_winit::platform_specific::wayland::commands::layer_surface::{
|
||||
destroy_layer_surface, get_layer_surface,
|
||||
},
|
||||
scroll::DiscreteScrollState,
|
||||
};
|
||||
use cosmic_comp_config::CosmicCompConfig;
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@ use cosmic::{
|
|||
wayland_client::protocol::wl_output,
|
||||
wayland_protocols::ext::workspace::v1::client::ext_workspace_handle_v1,
|
||||
},
|
||||
iced::core::{
|
||||
Shadow,
|
||||
text::{Ellipsize, EllipsizeHeightLimit},
|
||||
},
|
||||
iced::{
|
||||
self, Alignment, Border, Length,
|
||||
advanced::layout::flex::Axis,
|
||||
clipboard::mime::{AllowedMimeTypes, AsMimeTypes},
|
||||
platform_specific::shell::subsurface_widget::Subsurface,
|
||||
widget::{column, row},
|
||||
},
|
||||
iced_core::{
|
||||
Shadow,
|
||||
text::{Ellipsize, EllipsizeHeightLimit},
|
||||
},
|
||||
iced_winit::platform_specific::wayland::subsurface_widget::Subsurface,
|
||||
widget::{self, Widget},
|
||||
};
|
||||
use cosmic_comp_config::workspace::WorkspaceLayout;
|
||||
|
|
@ -43,7 +43,7 @@ fn dnd_source_with_drag_surface<D: AsMimeTypes + Send + Clone + 'static>(
|
|||
.drag_icon(move |offset| {
|
||||
(
|
||||
drag_icon().map(|_| ()),
|
||||
cosmic::iced_core::widget::tree::State::None,
|
||||
cosmic::iced::core::widget::tree::State::None,
|
||||
-offset,
|
||||
)
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
// Renders image behind widget, and otherwise passes through all behavior
|
||||
|
||||
use cosmic::{
|
||||
iced::{
|
||||
Length, Rectangle, Size, Vector,
|
||||
advanced::{
|
||||
Clipboard, Layout, Shell, Widget,
|
||||
layout::{self},
|
||||
mouse, overlay, renderer,
|
||||
widget::{Operation, Tree, tree},
|
||||
},
|
||||
event::{self, Event},
|
||||
use cosmic::iced::{
|
||||
Length, Rectangle, Size, Vector,
|
||||
advanced::{
|
||||
Clipboard, Layout, Shell, Widget,
|
||||
layout::{self},
|
||||
mouse, overlay, renderer,
|
||||
widget::{Operation, Tree, tree},
|
||||
},
|
||||
iced_core::Renderer,
|
||||
core::Renderer,
|
||||
event::Event,
|
||||
};
|
||||
|
||||
use std::marker::PhantomData;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue