Update raw-window-handle to v0.5
Update raw-window-handle to v0.5. This mainly consisted of using the newly added RawDisplayHandle trait instead of the previously used RawWindowHandle trait. For the Linux implementation, this also included updating winit to v0.27
This commit is contained in:
parent
c97306d269
commit
1392da8339
8 changed files with 18 additions and 18 deletions
|
|
@ -12,7 +12,7 @@ keywords = ["clipboard", "window", "ui", "gui", "raw-window-handle"]
|
|||
categories = ["gui"]
|
||||
|
||||
[dependencies]
|
||||
raw-window-handle = "0.3"
|
||||
raw-window-handle = "0.5"
|
||||
thiserror = "1.0"
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
|
|
@ -27,7 +27,7 @@ clipboard_wayland = { version = "0.2", path = "./wayland" }
|
|||
|
||||
[dev-dependencies]
|
||||
rand = "0.8"
|
||||
winit = "0.23"
|
||||
winit = "0.27"
|
||||
|
||||
[workspace]
|
||||
members = [
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ mod platform;
|
|||
#[path = "platform/dummy.rs"]
|
||||
mod platform;
|
||||
|
||||
use raw_window_handle::HasRawWindowHandle;
|
||||
use raw_window_handle::HasRawDisplayHandle;
|
||||
use std::error::Error;
|
||||
|
||||
pub struct Clipboard {
|
||||
|
|
@ -52,7 +52,7 @@ pub struct Clipboard {
|
|||
}
|
||||
|
||||
impl Clipboard {
|
||||
pub fn connect<W: HasRawWindowHandle>(
|
||||
pub fn connect<W: HasRawDisplayHandle>(
|
||||
window: &W,
|
||||
) -> Result<Self, Box<dyn Error>> {
|
||||
let raw = platform::connect(window)?;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
use crate::ClipboardProvider;
|
||||
|
||||
use raw_window_handle::HasRawWindowHandle;
|
||||
use raw_window_handle::HasRawDisplayHandle;
|
||||
use std::error::Error;
|
||||
|
||||
pub fn connect<W: HasRawWindowHandle>(
|
||||
pub fn connect<W: HasRawDisplayHandle>(
|
||||
_window: &W,
|
||||
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
|
||||
Ok(Box::new(Clipboard::new()?))
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
use crate::ClipboardProvider;
|
||||
|
||||
use raw_window_handle::HasRawWindowHandle;
|
||||
use raw_window_handle::HasRawDisplayHandle;
|
||||
|
||||
struct Dummy;
|
||||
|
||||
pub fn connect<W: HasRawWindowHandle>(
|
||||
pub fn connect<W: HasRawDisplayHandle>(
|
||||
_window: &W,
|
||||
) -> Result<Box<dyn ClipboardProvider>, Box<dyn std::error::Error>> {
|
||||
Ok(Box::new(Dummy))
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
use crate::ClipboardProvider;
|
||||
|
||||
use raw_window_handle::HasRawWindowHandle;
|
||||
use raw_window_handle::HasRawDisplayHandle;
|
||||
use std::error::Error;
|
||||
|
||||
pub fn connect<W: HasRawWindowHandle>(
|
||||
pub fn connect<W: HasRawDisplayHandle>(
|
||||
_window: &W,
|
||||
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
|
||||
Ok(Box::new(Clipboard::new()?))
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
use crate::ClipboardProvider;
|
||||
|
||||
use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
|
||||
use raw_window_handle::{HasRawDisplayHandle, RawDisplayHandle};
|
||||
use std::error::Error;
|
||||
|
||||
pub use clipboard_wayland as wayland;
|
||||
pub use clipboard_x11 as x11;
|
||||
|
||||
pub fn connect<W: HasRawWindowHandle>(
|
||||
pub fn connect<W: HasRawDisplayHandle>(
|
||||
window: &W,
|
||||
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
|
||||
let clipboard = match window.raw_window_handle() {
|
||||
RawWindowHandle::Wayland(handle) => {
|
||||
let clipboard = match window.raw_display_handle() {
|
||||
RawDisplayHandle::Wayland(handle) => {
|
||||
assert!(!handle.display.is_null());
|
||||
|
||||
Box::new(unsafe {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
use crate::ClipboardProvider;
|
||||
|
||||
use raw_window_handle::HasRawWindowHandle;
|
||||
use raw_window_handle::HasRawDisplayHandle;
|
||||
use std::error::Error;
|
||||
|
||||
pub fn connect<W: HasRawWindowHandle>(
|
||||
pub fn connect<W: HasRawDisplayHandle>(
|
||||
_window: &W,
|
||||
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
|
||||
Ok(Box::new(clipboard_macos::Clipboard::new()?))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
use crate::ClipboardProvider;
|
||||
|
||||
use clipboard_win::{get_clipboard_string, set_clipboard_string};
|
||||
use raw_window_handle::HasRawWindowHandle;
|
||||
use raw_window_handle::HasRawDisplayHandle;
|
||||
|
||||
use std::error::Error;
|
||||
|
||||
pub fn connect<W: HasRawWindowHandle>(
|
||||
pub fn connect<W: HasRawDisplayHandle>(
|
||||
_window: &W,
|
||||
) -> Result<Box<dyn ClipboardProvider>, Box<dyn Error>> {
|
||||
Ok(Box::new(Clipboard))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue