summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bridle <ben@derelict.engineering>2024-12-16 14:45:21 +1300
committerBen Bridle <ben@derelict.engineering>2024-12-16 14:45:21 +1300
commit58faa15a909fe849e7e14a26cca85baf40e7598a (patch)
treebfc7ecff50dd21289306c87c8256d325ef59a12c
parent87f8faba2fde2ac4cfa79dbb1f30907b6e48653c (diff)
downloadbedrock-pc-58faa15a909fe849e7e14a26cca85baf40e7598a.zip
Update phosphor dependency to v3.2.1
This includes a fix to prevent the cursor from being marked as inactive while at least one mouse button is still being held.
-rw-r--r--Cargo.lock4
-rw-r--r--Cargo.toml2
-rw-r--r--src/devices/input_device.rs1
3 files changed, 4 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 0840c24..8f7969a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -932,8 +932,8 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "phosphor"
-version = "3.1.0"
-source = "git+git://benbridle.com/phosphor?tag=v3.1.0#f69c4065488f792a51641a126ba58ec541819f22"
+version = "3.2.1"
+source = "git+git://benbridle.com/phosphor?tag=v3.2.1#34217d9e35fb3f4abfa0f94184b0fa739f3c36c2"
dependencies = [
"buffer",
"event_queue",
diff --git a/Cargo.toml b/Cargo.toml
index fc88310..dd5b0f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ description = "Emulator for running Bedrock programs"
[dependencies]
bedrock-asm = { git = "git://benbridle.com/bedrock_asm", tag = "v4.0.6" }
bedrock-core = { git = "git://benbridle.com/bedrock_core", tag = "v5.0.0" }
-phosphor = { git = "git://benbridle.com/phosphor", tag = "v3.1.0" }
+phosphor = { git = "git://benbridle.com/phosphor", tag = "v3.2.1" }
geometry = { git = "git://benbridle.com/geometry", tag = "v1.0.0" }
chrono = { version = "0.4.38" }
diff --git a/src/devices/input_device.rs b/src/devices/input_device.rs
index 638c277..9b7038c 100644
--- a/src/devices/input_device.rs
+++ b/src/devices/input_device.rs
@@ -105,6 +105,7 @@ impl InputDevice {
MouseButton::Left => 0x80,
MouseButton::Middle => 0x40,
MouseButton::Right => 0x20,
+ _ => return,
};
let pointer_buttons = match action {
Action::Pressed => self.pointer_buttons | mask,