From b7d8333e9ae158051e274a2a5c4f40096912661c Mon Sep 17 00:00:00 2001 From: keith Date: Thu, 13 Feb 2020 23:29:13 -0800 Subject: [PATCH] use public skulpin --- Cargo.lock | 4 +++- Cargo.toml | 2 +- src/window.rs | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5e3cc59..0f83c93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1039,7 +1039,7 @@ dependencies = [ "rmpv 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "rust-embed 5.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "skribo 0.0.1 (git+https://github.com/linebender/skribo)", - "skulpin 0.5.2", + "skulpin 0.5.2 (git+https://github.com/Kethku/skulpin?branch=sdl2)", "tokio 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1610,6 +1610,7 @@ dependencies = [ [[package]] name = "skulpin" version = "0.5.2" +source = "git+https://github.com/Kethku/skulpin?branch=sdl2#c4926bb80017606fc49d205625facc14ee6c7897" dependencies = [ "ash 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2095,6 +2096,7 @@ dependencies = [ "checksum skia-bindings 0.26.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3a38d82d2d3021c59e4a21f799f894bb59c8bf4161836896338ef50f8fe3cbc" "checksum skia-safe 0.26.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c02fb631f02d1a0a1e94c6ddd5a7200b7ef8b348c758e171da558fd72321015" "checksum skribo 0.0.1 (git+https://github.com/linebender/skribo)" = "" +"checksum skulpin 0.5.2 (git+https://github.com/Kethku/skulpin?branch=sdl2)" = "" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" diff --git a/Cargo.toml b/Cargo.toml index ed3f1d1..28e31c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ euclid = "0.20.7" font-kit = "0.5.0" skribo = { git = "https://github.com/linebender/skribo" } lru = "0.4.3" -skulpin = { path = "../skulpin" } +skulpin = { git = "https://github.com/Kethku/skulpin", branch = "sdl2" } derive-new = "0.5" rmpv = "0.4.4" rust-embed = { version = "5.2.0", features = ["debug-embed"] } diff --git a/src/window.rs b/src/window.rs index abd0298..b02b1cb 100644 --- a/src/window.rs +++ b/src/window.rs @@ -126,9 +126,6 @@ pub fn ui_loop() { BRIDGE.queue_command(UiCommand::Keyboard(append_modifiers(modifiers, key_text, special))); } }, - Event::MouseMotion { - - } Event::TextInput { text, ..