hammy
/
neovide
mirror of https://github.com/sgoudham/neovide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Husky (#277)

Browse Source 
* add husky dev dep

* clippy suggestions

* bump version

* save cargo lock

* fix epsilon issue for linux

* forgot to save

* my mistake
macos-click-through
j4qfrost 4 years ago committed by GitHub
parent 92757ea70c
commit 1892073c8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 533 additions and 535 deletions
Show Stats Download Patch File Download Diff File

83
Cargo.lock generated
Unescape Escape View File

@ -103,7 +103,7 @@ checksum = "da71fef07bc806586090247e971229289f64c210a278ee5ae419314eb386b31d"
dependencies = [ dependencies = [
"proc-macro2 1.0.12", "proc-macro2 1.0.12",
"quote 1.0.4", "quote 1.0.4",
"syn 1.0.18", "syn 1.0.19",
] ]
[[package]] [[package]]
@ -237,6 +237,12 @@ dependencies = [
"nix", "nix",
] ]
[[package]]
name = "cargo-husky"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.52" version = "1.0.52"
@ -442,13 +448,13 @@ dependencies = [
[[package]] [[package]]
name = "core-video-sys" name = "core-video-sys"
version = "0.1.3" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8dc065219542086f72d1e9f7aadbbab0989e980263695d129d502082d063a9d0" checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"core-foundation-sys 0.6.2", "core-foundation-sys 0.7.0",
"core-graphics 0.17.3", "core-graphics 0.19.0",
"libc", "libc",
"objc", "objc",
] ]
@ -557,7 +563,7 @@ checksum = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9"
dependencies = [ dependencies = [
"proc-macro2 1.0.12", "proc-macro2 1.0.12",
"quote 1.0.4", "quote 1.0.4",
"syn 1.0.18", "syn 1.0.19",
] ]
[[package]] [[package]]
@ -657,9 +663,9 @@ dependencies = [
[[package]] [[package]]
name = "euclid" name = "euclid"
version = "0.20.10" version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c6a5b0c779cd0b744c73a1d2083faf181080d696903cdad99a3b03d015d7030" checksum = "667703ececa1ac04d1d40ae0c0fd6401b91d8caccfda3a65458ca8ee5dfedf1c"
dependencies = [ dependencies = [
"num-traits", "num-traits",
] ]
@ -875,7 +881,7 @@ dependencies = [
"proc-macro-hack", "proc-macro-hack",
"proc-macro2 1.0.12", "proc-macro2 1.0.12",
"quote 1.0.4", "quote 1.0.4",
"syn 1.0.18", "syn 1.0.19",
] ]
[[package]] [[package]]
@ -1289,9 +1295,9 @@ dependencies = [
[[package]] [[package]]
name = "mockall" name = "mockall"
version = "0.7.0" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c9eefc7768ee7a28a09d64e40203d57ad20af8525b7428d5f2f55d8c621984" checksum = "256489d4d106cd2bc9e98ed0337402db0044de0621745d5d9eb70a14295ff77b"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"downcast", "downcast",
@ -1304,14 +1310,14 @@ dependencies = [
[[package]] [[package]]
name = "mockall_derive" name = "mockall_derive"
version = "0.7.0" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "447326d4e6d99ea272b6e5599cbbfc1e3407c23a856ccf1eb9427ad73267376f" checksum = "826e14e8643cb12103b56efb963e5f9640b69b0f7bdcc460002092df4b0e959f"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"proc-macro2 1.0.12", "proc-macro2 1.0.12",
"quote 1.0.4", "quote 1.0.4",
"syn 1.0.18", "syn 1.0.19",
] ]
[[package]] [[package]]
@ -1320,6 +1326,7 @@ version = "0.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
"cargo-husky",
"cfg-if", "cfg-if",
"derive-new", "derive-new",
"euclid", "euclid",
@ -1565,29 +1572,29 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]] [[package]]
name = "pin-project" name = "pin-project"
version = "0.4.9" version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f6a7f5eee6292c559c793430c55c00aea9d3b3d1905e855806ca4d7253426a2" checksum = "82c3bfbfb5bb42f99498c7234bbd768c220eb0cea6818259d0d18a1aa3d2595d"
dependencies = [ dependencies = [
"pin-project-internal", "pin-project-internal",
] ]
[[package]] [[package]]
name = "pin-project-internal" name = "pin-project-internal"
version = "0.4.9" version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8988430ce790d8682672117bc06dda364c0be32d3abd738234f19f3240bad99a" checksum = "ccbf6449dcfb18562c015526b085b8df1aa3cdab180af8ec2ebd300a3bd28f63"
dependencies = [ dependencies = [
"proc-macro2 1.0.12", "proc-macro2 1.0.12",
"quote 1.0.4", "quote 1.0.4",
"syn 1.0.18", "syn 1.0.19",
] ]
[[package]] [[package]]
name = "pin-project-lite" name = "pin-project-lite"
version = "0.1.4" version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae" checksum = "f7505eeebd78492e0f6108f7171c4948dbb120ee8119d9d77d0afa5469bef67f"
[[package]] [[package]]
name = "pin-utils" name = "pin-utils"
@ -1862,7 +1869,7 @@ checksum = "60cacc306d294556771c6e92737ba7e6be0264144bc46dd713a14ef384b0d6b8"
dependencies = [ dependencies = [
"quote 1.0.4", "quote 1.0.4",
"rust-embed-utils", "rust-embed-utils",
"syn 1.0.18", "syn 1.0.19",
"walkdir", "walkdir",
] ]
@ -2060,9 +2067,9 @@ dependencies = [
[[package]] [[package]]
name = "skia-bindings" name = "skia-bindings"
version = "0.27.2" version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ef181a694c8e2961ae2d08acbd814eba9e8840b1523d6c4f8c1fd8881b38394" checksum = "bfa4cc006be07441ba7129e9ac39c750af5d5120759e95a3ba121d9c6ca94c0e"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"cc", "cc",
@ -2077,9 +2084,9 @@ dependencies = [
[[package]] [[package]]
name = "skia-safe" name = "skia-safe"
version = "0.27.2" version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f903a58575ccbe0c24c375c58bb0e5a1ff553f813b01a4baf9521682de87e77d" checksum = "59cfb4ded0c38514114de4b0835e9aea335382f0e318a365be62af40dd904faa"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"lazy_static", "lazy_static",
@ -2101,8 +2108,8 @@ dependencies = [
[[package]] [[package]]
name = "skulpin" name = "skulpin"
version = "0.9.2" version = "0.9.4"
source = "git+https://github.com/aclysma/skulpin#9ab2c72fef9b903b70faad369c6fd60ffea82727" source = "git+https://github.com/aclysma/skulpin#6139a1f158080b5007b81c60110162bbd4a9d3a9"
dependencies = [ dependencies = [
"log", "log",
"skulpin-app-winit", "skulpin-app-winit",
@ -2114,7 +2121,7 @@ dependencies = [
[[package]] [[package]]
name = "skulpin-app-winit" name = "skulpin-app-winit"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/aclysma/skulpin#9ab2c72fef9b903b70faad369c6fd60ffea82727" source = "git+https://github.com/aclysma/skulpin#6139a1f158080b5007b81c60110162bbd4a9d3a9"
dependencies = [ dependencies = [
"log", "log",
"skulpin-renderer", "skulpin-renderer",
@ -2124,7 +2131,7 @@ dependencies = [
[[package]] [[package]]
name = "skulpin-renderer" name = "skulpin-renderer"
version = "0.3.1" version = "0.3.1"
source = "git+https://github.com/aclysma/skulpin#9ab2c72fef9b903b70faad369c6fd60ffea82727" source = "git+https://github.com/aclysma/skulpin#6139a1f158080b5007b81c60110162bbd4a9d3a9"
dependencies = [ dependencies = [
"ash", "ash",
"log", "log",
@ -2134,8 +2141,8 @@ dependencies = [
[[package]] [[package]]
name = "skulpin-renderer-sdl2" name = "skulpin-renderer-sdl2"
version = "0.3.1" version = "0.3.3"
source = "git+https://github.com/aclysma/skulpin#9ab2c72fef9b903b70faad369c6fd60ffea82727" source = "git+https://github.com/aclysma/skulpin#6139a1f158080b5007b81c60110162bbd4a9d3a9"
dependencies = [ dependencies = [
"log", "log",
"sdl2", "sdl2",
@ -2145,7 +2152,7 @@ dependencies = [
[[package]] [[package]]
name = "skulpin-renderer-winit" name = "skulpin-renderer-winit"
version = "0.3.1" version = "0.3.1"
source = "git+https://github.com/aclysma/skulpin#9ab2c72fef9b903b70faad369c6fd60ffea82727" source = "git+https://github.com/aclysma/skulpin#6139a1f158080b5007b81c60110162bbd4a9d3a9"
dependencies = [ dependencies = [
"cocoa", "cocoa",
"log", "log",
@ -2225,9 +2232,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.18" version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" checksum = "e8e5aa70697bb26ee62214ae3288465ecec0000f05182f039b477001f08f5ae7"
dependencies = [ dependencies = [
"proc-macro2 1.0.12", "proc-macro2 1.0.12",
"quote 1.0.4", "quote 1.0.4",
@ -2337,7 +2344,7 @@ checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
dependencies = [ dependencies = [
"proc-macro2 1.0.12", "proc-macro2 1.0.12",
"quote 1.0.4", "quote 1.0.4",
"syn 1.0.18", "syn 1.0.19",
] ]
[[package]] [[package]]
@ -2407,9 +2414,9 @@ checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
[[package]] [[package]]
name = "vec_map" name = "vec_map"
version = "0.8.1" version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]] [[package]]
name = "version_check" name = "version_check"

5
Cargo.toml
Unescape Escape View File

@ -36,6 +36,11 @@ which = "3.1"
mockall = "0.7.0" mockall = "0.7.0"
rand = "0.7" rand = "0.7"
[dev-dependencies.cargo-husky]
version = "1"
default-features = false
features = ["precommit-hook", "run-cargo-test", "run-cargo-clippy", "run-cargo-fmt"]
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi = "0.3.8" winapi = "0.3.8"

10
src/bridge/layouts/mod.rs
Unescape Escape View File

@ -59,12 +59,12 @@ fn append_modifiers(
gui: bool, gui: bool,
) -> String { ) -> String {
let mut result = keycode_text.to_string(); let mut result = keycode_text.to_string();
let mut special = special; let mut special = if result == "<" {
if result == "<" {
result = "lt".to_string(); result = "lt".to_string();
special = true; true
} } else {
special
};
if shift { if shift {
special = true; special = true;

6
src/bridge/ui_commands.rs
Unescape Escape View File

@ -42,7 +42,7 @@ impl UiCommand {
action, action,
position: (grid_x, grid_y), position: (grid_x, grid_y),
} => { } => {
if { EDITOR.lock().mouse_enabled } { if EDITOR.lock().mouse_enabled {
nvim.input_mouse("left", &action, "", 0, grid_y as i64, grid_x as i64) nvim.input_mouse("left", &action, "", 0, grid_y as i64, grid_x as i64)
.await .await
.expect("Mouse Input Failed"); .expect("Mouse Input Failed");
@ -52,14 +52,14 @@ impl UiCommand {
direction, direction,
position: (grid_x, grid_y), position: (grid_x, grid_y),
} => { } => {
if { EDITOR.lock().mouse_enabled } { if EDITOR.lock().mouse_enabled {
nvim.input_mouse("wheel", &direction, "", 0, grid_y as i64, grid_x as i64) nvim.input_mouse("wheel", &direction, "", 0, grid_y as i64, grid_x as i64)
.await .await
.expect("Mouse Scroll Failed"); .expect("Mouse Scroll Failed");
} }
} }
UiCommand::Drag(grid_x, grid_y) => { UiCommand::Drag(grid_x, grid_y) => {
if { EDITOR.lock().mouse_enabled } { if EDITOR.lock().mouse_enabled {
nvim.input_mouse("left", "drag", "", 0, grid_y as i64, grid_x as i64) nvim.input_mouse("left", "drag", "", 0, grid_y as i64, grid_x as i64)
.await .await
.expect("Mouse Drag Failed"); .expect("Mouse Drag Failed");

3
src/editor/grid.rs
Unescape Escape View File

@ -79,11 +79,10 @@ impl CharacterGrid {
} }
pub fn set_characters_all(&mut self, value: GridCell) { pub fn set_characters_all(&mut self, value: GridCell) {
let cloned_value = value.clone();
self.characters.clear(); self.characters.clear();
self.characters self.characters
.resize_with((self.width * self.height) as usize, || { .resize_with((self.width * self.height) as usize, || {
cloned_value.as_ref().cloned() value.as_ref().cloned()
}); });
} }

5
src/editor/mod.rs
Unescape Escape View File

@ -301,11 +301,8 @@ impl Editor {
fn set_option(&mut self, gui_option: GuiOption) { fn set_option(&mut self, gui_option: GuiOption) {
trace!("Option set {:?}", &gui_option); trace!("Option set {:?}", &gui_option);
match gui_option { if let GuiOption::GuiFont(guifont) = gui_option {
GuiOption::GuiFont(guifont) => {
self.guifont = Some(guifont); self.guifont = Some(guifont);
} }
_ => {}
}
} }
} }

21
src/renderer/caching_shaper.rs
Unescape Escape View File

@ -79,7 +79,7 @@ impl ExtendedFontFamily {
pub fn from_normal_font_family(fonts: &[Handle]) -> ExtendedFontFamily { pub fn from_normal_font_family(fonts: &[Handle]) -> ExtendedFontFamily {
let mut family = ExtendedFontFamily::new(); let mut family = ExtendedFontFamily::new();
for font in fonts.into_iter() { for font in fonts.iter() {
if let Ok(font) = font.load() { if let Ok(font) = font.load() {
family.add_font(SkriboFont::new(font)); family.add_font(SkriboFont::new(font));
} }
@ -88,11 +88,11 @@ impl ExtendedFontFamily {
family family
} }
pub fn to_normal_font_family(self) -> FontFamily { pub fn to_normal_font_family(&self) -> FontFamily {
let mut new_family = FontFamily::new(); let mut new_family = FontFamily::new();
for font in self.fonts { for font in &self.fonts {
new_family.add_font(font); new_family.add_font(font.clone());
} }
new_family new_family
@ -113,17 +113,18 @@ impl FontLoader {
} }
fn get(&mut self, font_name: &str) -> Option<ExtendedFontFamily> { fn get(&mut self, font_name: &str) -> Option<ExtendedFontFamily> {
return self.cache.get(&String::from(font_name)).cloned(); self.cache.get(&String::from(font_name)).cloned()
} }
#[cfg(feature = "embed-fonts")] #[cfg(feature = "embed-fonts")]
fn load_from_asset(&mut self, font_name: &str) -> Option<ExtendedFontFamily> { fn load_from_asset(&mut self, font_name: &str) -> Option<ExtendedFontFamily> {
let mut family = ExtendedFontFamily::new(); let mut family = ExtendedFontFamily::new();
Asset::get(font_name) if let Some(font) = Asset::get(font_name)
.and_then(|font_data| Font::from_bytes(font_data.to_vec().into(), 0).ok()) .and_then(|font_data| Font::from_bytes(font_data.to_vec().into(), 0).ok())
.map(|font| family.add_font(SkriboFont::new(font))); {
family.add_font(SkriboFont::new(font))
}
self.cache.put(String::from(font_name), family); self.cache.put(String::from(font_name), family);
self.get(font_name) self.get(font_name)
} }
@ -162,7 +163,7 @@ struct ShapeKey {
pub fn build_collection_by_font_name( pub fn build_collection_by_font_name(
loader: &mut FontLoader, loader: &mut FontLoader,
fallback_list: &Vec<String>, fallback_list: &[String],
bold: bool, bold: bool,
italic: bool, italic: bool,
) -> FontCollection { ) -> FontCollection {
@ -212,7 +213,7 @@ struct FontSet {
} }
impl FontSet { impl FontSet {
fn new(fallback_list: &Vec<String>, mut loader: &mut FontLoader) -> FontSet { fn new(fallback_list: &[String], mut loader: &mut FontLoader) -> FontSet {
FontSet { FontSet {
normal: build_collection_by_font_name(&mut loader, fallback_list, false, false), normal: build_collection_by_font_name(&mut loader, fallback_list, false, false),
bold: build_collection_by_font_name(&mut loader, fallback_list, true, false), bold: build_collection_by_font_name(&mut loader, fallback_list, true, false),

2
src/renderer/cursor_renderer/animation_utils.rs
Unescape Escape View File

@ -58,7 +58,7 @@ pub fn ease_in_expo(t: f32) -> f32 {
#[allow(dead_code)] #[allow(dead_code)]
pub fn ease_out_expo(t: f32) -> f32 { pub fn ease_out_expo(t: f32) -> f32 {
if t == 1.0 { if (t - 1.0).abs() < std::f32::EPSILON {
1.0 1.0
} else { } else {
1.0 - 2.0f32.powf(-10.0 * t) 1.0 - 2.0f32.powf(-10.0 * t)

4
src/renderer/cursor_renderer/cursor_vfx.rs
Unescape Escape View File

@ -131,7 +131,7 @@ impl CursorVfx for PointHighlight {
colors: &Colors, colors: &Colors,
font_size: (f32, f32), font_size: (f32, f32),
) { ) {
if self.t == 1.0 { if (self.t - 1.0).abs() < std::f32::EPSILON {
return; return;
} }
@ -257,7 +257,7 @@ impl CursorVfx for ParticleTrail {
let speed = match self.trail_mode { let speed = match self.trail_mode {
TrailMode::Railgun => { TrailMode::Railgun => {
let phase = t / 3.141592 let phase = t / std::f32::consts::PI
* settings.vfx_particle_phase * settings.vfx_particle_phase
* (travel_distance / font_size.0); * (travel_distance / font_size.0);
Point::new(phase.sin(), phase.cos()) * 2.0 * settings.vfx_particle_speed Point::new(phase.sin(), phase.cos()) * 2.0 * settings.vfx_particle_speed

8
src/renderer/cursor_renderer/mod.rs
Unescape Escape View File

@ -118,7 +118,7 @@ impl Corner {
} }
// Check first if animation's over // Check first if animation's over
if self.t > 1.0 { if (self.t - 1.0).abs() < std::f32::EPSILON {
return false; return false;
} }
@ -154,7 +154,7 @@ impl Corner {
let direction_alignment = travel_direction.dot(corner_direction); let direction_alignment = travel_direction.dot(corner_direction);
if self.t == 1.0 { if (self.t - 1.0).abs() < std::f32::EPSILON {
// We are at destination, move t out of 0-1 range to stop the animation // We are at destination, move t out of 0-1 range to stop the animation
self.t = 2.0; self.t = 2.0;
} else { } else {
@ -238,12 +238,12 @@ impl CursorRenderer {
&mut self, &mut self,
cursor: Cursor, cursor: Cursor,
default_colors: &Colors, default_colors: &Colors,
font_width: f32, font_size: (f32, f32),
font_height: f32,
shaper: &mut CachingShaper, shaper: &mut CachingShaper,
canvas: &mut Canvas, canvas: &mut Canvas,
dt: f32, dt: f32,
) { ) {
let (font_width, font_height) = font_size;
let render = self.blink_status.update_status(&cursor); let render = self.blink_status.update_status(&cursor);
let settings = SETTINGS.get::<CursorSettings>(); let settings = SETTINGS.get::<CursorSettings>();

4
src/renderer/font_options.rs
Unescape Escape View File

@ -32,7 +32,7 @@ impl FontOptions {
.map(|fallback| fallback.to_string()) .map(|fallback| fallback.to_string())
.collect(); .collect();
if parsed_fallback_list.len() > 0 && self.fallback_list != parsed_fallback_list { if parsed_fallback_list.is_empty() && self.fallback_list != parsed_fallback_list {
self.fallback_list = parsed_fallback_list; self.fallback_list = parsed_fallback_list;
updated = true; updated = true;
} }
@ -40,7 +40,7 @@ impl FontOptions {
for part in parts { for part in parts {
if part.starts_with('h') && part.len() > 1 { if part.starts_with('h') && part.len() > 1 {
if let Some(size) = part[1..].parse::<f32>().ok() { if let Ok(size) = part[1..].parse::<f32>() {
if (self.size - size).abs() > std::f32::EPSILON { if (self.size - size).abs() > std::f32::EPSILON {
self.size = size; self.size = size;
updated = true; updated = true;

7
src/renderer/mod.rs
Unescape Escape View File

@ -201,7 +201,7 @@ impl Renderer {
for command in draw_commands.iter() { for command in draw_commands.iter() {
self.draw_background( self.draw_background(
&mut canvas, &mut canvas,
command.grid_position.clone(), command.grid_position,
command.cell_width, command.cell_width,
&command.style, &command.style,
&default_style, &default_style,
@ -212,7 +212,7 @@ impl Renderer {
self.draw_foreground( self.draw_foreground(
&mut canvas, &mut canvas,
&command.text, &command.text,
command.grid_position.clone(), command.grid_position,
command.cell_width, command.cell_width,
&command.style, &command.style,
&default_style, &default_style,
@ -234,8 +234,7 @@ impl Renderer {
self.cursor_renderer.draw( self.cursor_renderer.draw(
cursor, cursor,
&default_style.colors, &default_style.colors,
self.font_width, (self.font_width, self.font_height),
self.font_height,
&mut self.shaper, &mut self.shaper,
gpu_canvas, gpu_canvas,
dt, dt,

8
src/settings/mod.rs
Unescape Escape View File

@ -68,12 +68,8 @@ impl Settings {
if arg == "--log" { if arg == "--log" {
log_to_file = true; log_to_file = true;
false false
} else if arg.starts_with("--geometry=") {
false
} else if arg == "--wsl" {
false
} else { } else {
true !(arg.starts_with("--geometry=") || arg == "--wsl")
} }
}) })
.collect::<Vec<String>>(); .collect::<Vec<String>>();
@ -133,7 +129,7 @@ impl Settings {
write_lock.insert(type_id, Box::new(t)); write_lock.insert(type_id, Box::new(t));
} }
pub fn get<'a, T: Clone + Send + Sync + 'static>(&'a self) -> T { pub fn get<T: Clone + Send + Sync + 'static>(&'_ self) -> T {
let read_lock = self.settings.read(); let read_lock = self.settings.read();
let boxed = &read_lock let boxed = &read_lock
.get(&TypeId::of::<T>()) .get(&TypeId::of::<T>())

36
src/window.rs
Unescape Escape View File

@ -64,8 +64,7 @@ pub fn window_geometry() -> Result<(u64, u64), String> {
let prefix = "--geometry="; let prefix = "--geometry=";
std::env::args() std::env::args()
.filter(|arg| arg.starts_with(prefix)) .find(|arg| arg.starts_with(prefix))
.next()
.map_or(Ok(INITIAL_DIMENSIONS), |arg| { .map_or(Ok(INITIAL_DIMENSIONS), |arg| {
let input = &arg[prefix.len()..]; let input = &arg[prefix.len()..];
let invalid_parse_err = format!( let invalid_parse_err = format!(
@ -78,7 +77,7 @@ pub fn window_geometry() -> Result<(u64, u64), String> {
.map(|dimension| { .map(|dimension| {
dimension dimension
.parse::<u64>() .parse::<u64>()
.or(Err(invalid_parse_err.as_str())) .or_else(|_| Err(invalid_parse_err.as_str()))
.and_then(|dimension| { .and_then(|dimension| {
if dimension > 0 { if dimension > 0 {
Ok(dimension) Ok(dimension)
@ -242,7 +241,7 @@ impl WindowWrapper {
let transparency = { SETTINGS.get::<WindowSettings>().transparency }; let transparency = { SETTINGS.get::<WindowSettings>().transparency };
if let Ok(opacity) = self.window.opacity() { if let Ok(opacity) = self.window.opacity() {
if opacity != transparency { if (opacity - transparency).abs() > std::f32::EPSILON {
self.window.set_opacity(transparency).ok(); self.window.set_opacity(transparency).ok();
self.transparency = transparency; self.transparency = transparency;
} }
@ -311,12 +310,10 @@ impl WindowWrapper {
} }
pub fn handle_mouse_wheel(&mut self, x: i32, y: i32) { pub fn handle_mouse_wheel(&mut self, x: i32, y: i32) {
let vertical_input_type = if y > 0 { let vertical_input_type = match y {
Some("up") _ if y > 0 => Some("up"),
} else if y < 0 { _ if y < 0 => Some("down"),
Some("down") _ => None,
} else {
None
}; };
if let Some(input_type) = vertical_input_type { if let Some(input_type) = vertical_input_type {
@ -326,12 +323,10 @@ impl WindowWrapper {
}); });
} }
let horizontal_input_type = if x > 0 { let horizontal_input_type = match y {
Some("right") _ if x > 0 => Some("right"),
} else if x < 0 { _ if x < 0 => Some("left"),
Some("left") _ => None,
} else {
None
}; };
if let Some(input_type) = horizontal_input_type { if let Some(input_type) = horizontal_input_type {
@ -369,8 +364,7 @@ impl WindowWrapper {
if REDRAW_SCHEDULER.should_draw() || SETTINGS.get::<WindowSettings>().no_idle { if REDRAW_SCHEDULER.should_draw() || SETTINGS.get::<WindowSettings>().no_idle {
let renderer = &mut self.renderer; let renderer = &mut self.renderer;
let error = self
if self
.skulpin_renderer .skulpin_renderer
.draw(&sdl_window_wrapper, |canvas, coordinate_system_helper| { .draw(&sdl_window_wrapper, |canvas, coordinate_system_helper| {
let dt = 1.0 / (SETTINGS.get::<WindowSettings>().refresh_rate as f32); let dt = 1.0 / (SETTINGS.get::<WindowSettings>().refresh_rate as f32);
@ -379,14 +373,14 @@ impl WindowWrapper {
handle_new_grid_size(current_size, &renderer) handle_new_grid_size(current_size, &renderer)
} }
}) })
.is_err() .is_err();
{ if error {
error!("Render failed. Closing"); error!("Render failed. Closing");
return false; return false;
} }
} }
return true; true
} }
} }

Write Preview
Loading…
Cancel
Save