Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade smithay-client-toolkit to 0.19 #5781

Closed
wants to merge 1 commit into from
+50 −17
Closed

Upgrade smithay-client-toolkit to 0.19 #5781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions window/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ xcb-imdkit = { version="0.3", git="https://github.com/wez/xcb-imdkit-rs.git", re
zbus = "4.2"
zvariant = "4.0"

smithay-client-toolkit = {version = "0.18", default-features=false, optional=true}
wayland-protocols = {version="0.31", optional=true}
smithay-client-toolkit = {version = "0.19", default-features=false, optional=true}
wayland-protocols = {version="0.32", optional=true}
wayland-client = {version="0.31", optional=true}
wayland-egl = {version="0.32", optional=true}

Expand Down
6 changes: 6 additions & 0 deletions window/src/os/wayland/data_device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use smithay_client_toolkit::data_device_manager::data_source::DataSourceHandler;
use smithay_client_toolkit::data_device_manager::WritePipe;
use smithay_client_toolkit::reexports::client::protocol::wl_data_device::WlDataDevice;
use wayland_client::protocol::wl_data_device_manager::DndAction;
use wayland_client::protocol::wl_surface::WlSurface;
use wayland_client::Proxy;

use crate::wayland::drag_and_drop::SurfaceAndOffer;
Expand All @@ -23,6 +24,9 @@ impl DataDeviceHandler for WaylandState {
_conn: &wayland_client::Connection,
_qh: &wayland_client::QueueHandle<Self>,
data_device: &WlDataDevice,
_x: f64,
_y: f64,
_surface: &WlSurface,
) {
let data = match self.data_device {
Some(ref dv) if dv.inner() == data_device => dv.data(),
Expand Down Expand Up @@ -86,6 +90,8 @@ impl DataDeviceHandler for WaylandState {
_conn: &wayland_client::Connection,
_qh: &wayland_client::QueueHandle<Self>,
_data_device: &WlDataDevice,
_x: f64,
_y: f64,
) {
}

Expand Down
18 changes: 18 additions & 0 deletions window/src/os/wayland/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,6 +1314,24 @@ impl CompositorHandler for WaylandState {
) {
// TODO: do we need to do anything here?
}

fn surface_enter(
&mut self,
_conn: &WConnection,
_qh: &wayland_client::QueueHandle<Self>,
_surface: &wayland_client::protocol::wl_surface::WlSurface,
_output: &wayland_client::protocol::wl_output::WlOutput,
) {
}

fn surface_leave(
&mut self,
_conn: &WConnection,
_qh: &wayland_client::QueueHandle<Self>,
_surface: &wayland_client::protocol::wl_surface::WlSurface,
_output: &wayland_client::protocol::wl_output::WlOutput,
) {
}
}

impl WindowHandler for WaylandState {
Expand Down
Loading