Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xvar/mouse-button-names' into 'master'

Browse Source 
Fixed long mouse button names overflowing hotbar slots (#637)

See merge request veloren/veloren!1120
This commit is contained in:
Joshua Barretto 2020-06-28 11:11:29 +00:00
commit 41b03208cb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
voxygen/src/window.rs
View File

@ -370,11 +370,12 @@ impl fmt::Display for KeyMouse {
Key(Copy) => "Copy",
Key(Paste) => "Paste",
Key(Cut) => "Cut",
Mouse(MouseButton::Left) => "Mouse Left",
Mouse(MouseButton::Right) => "Mouse Right",
Mouse(MouseButton::Middle) => "Middle-Click",
Mouse(MouseButton::Left) => "M1",
Mouse(MouseButton::Right) => "M2",
Mouse(MouseButton::Middle) => "M3",
Mouse(MouseButton::Other(button)) =>
return write!(f, "Unknown Mouse Button: {:?}", button),
// Additional mouse buttons after middle click start at 1
return write!(f, "M{}", button + 3),
})
}
}