leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

iced: propagate pane drag destinations

Browse source
This commit is contained in:
Stephan Buys 2025-11-19 15:44:21 +02:00 • committed by Ashley Wulber
parent 1fb7e08f23
commit a489a6b790
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
9 changed files with 142 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
winit/src/platform_specific/wayland/event_loop/mod.rs
View file

@ -49,7 +49,7 @@ use std::{
collections::{HashMap, HashSet},
fmt::Debug,
};
use tracing::error;
use log::error;
use wayland_backend::client::Backend;
use wayland_client::globals::GlobalError;
use wayland_protocols::wp::keyboard_shortcuts_inhibit::zv1::client::zwp_keyboard_shortcuts_inhibit_manager_v1;

8
winit/src/platform_specific/wayland/event_loop/state.rs
View file

@ -1444,7 +1444,7 @@ impl SctkState {
platform_specific::wayland::session_lock::Action::LockSurface { id, output } => {
// Should we panic if the id does not match?
if self.lock_surfaces.iter().any(|s| s.output == output) {
tracing::warn!("Cannot create multiple lock surfaces for a single output.");
log::warn!("Cannot create multiple lock surfaces for a single output.");
return Ok(());
}
// TODO how to handle this when there's no lock?
@ -1488,13 +1488,13 @@ impl SctkState {
Action::OverlapNotify(id, enabled) => {
if let Some(layer_surface) = self.layer_surfaces.iter_mut().find(|l| l.id == id) {
let Some(overlap_notify_state) = self.overlap_notify.as_ref() else {
tracing::error!("Overlap notify is not supported.");
log::error!("Overlap notify is not supported.");
return Ok(());
};
let my_id = layer_surface.surface.wl_surface().id();
if enabled && !self.overlap_notifications.contains_key(&my_id) {
let SurfaceKind::Wlr(wlr) = &layer_surface.surface.kind() else {
tracing::error!("Overlap notify is not supported for non wlr surface.");
log::error!("Overlap notify is not supported for non wlr surface.");
return Ok(());
};
let notification = overlap_notify_state.notify.notify_on_overlap(wlr, &self.queue_handle, OverlapNotificationV1 { surface: layer_surface.surface.wl_surface().clone() });
@ -1503,7 +1503,7 @@ impl SctkState {
_ = self.overlap_notifications.remove(&my_id);
}
} else {
tracing::error!("Overlap notify subscription cannot be created for surface. No matching layer surface found.");
log::error!("Overlap notify subscription cannot be created for surface. No matching layer surface found.");
}
},
Action::Subsurface(action) => match action {

6
winit/src/platform_specific/wayland/winit_window.rs
View file

@ -242,9 +242,7 @@ impl winit::window::Window for SctkWinitWindow {
}
fn current_monitor(&self) -> Option<winit::monitor::MonitorHandle> {
tracing::warn!(
"current_monitor is not implemented for wayland windows."
);
log::warn!("current_monitor is not implemented for wayland windows.");
None
}
@ -255,7 +253,7 @@ impl winit::window::Window for SctkWinitWindow {
}
fn has_focus(&self) -> bool {
tracing::warn!("has_focus is not implemented for wayland windows.");
log::warn!("has_focus is not implemented for wayland windows.");
false
}