diff --git a/data/keyboards/nb.yaml b/data/keyboards/nb.yaml index 98c0dc4c..20627d48 100644 --- a/data/keyboards/nb.yaml +++ b/data/keyboards/nb.yaml @@ -3,16 +3,12 @@ bounds: { x: 0, y: 6.33, width: 426, height: 250 } outlines: default: - corner_radius: 1 bounds: { x: 0, y: 0, width: 32, height: 52 } altline: - corner_radius: 1 bounds: { x: 0, y: 0, width: 48.39024, height: 52 } outline7: - corner_radius: 1 bounds: { x: 0, y: 0, width: 88.97561, height: 52 } spaceline: - corner_radius: 1 bounds: { x: 0, y: 0, width: 150.5853, height: 52 } views: diff --git a/data/keyboards/number.yaml b/data/keyboards/number.yaml index 8ca1a44f..0530975f 100644 --- a/data/keyboards/number.yaml +++ b/data/keyboards/number.yaml @@ -3,16 +3,12 @@ bounds: { x: 0, y: 6.33, width: 410, height: 250 } outlines: default: - corner_radius: 1 bounds: { x: 0, y: 0, width: 37.46341, height: 52 } altline: - corner_radius: 1 bounds: { x: 0, y: 0, width: 48.39024, height: 52 } outline7: - corner_radius: 1 bounds: { x: 0, y: 0, width: 88.97561, height: 52 } spaceline: - corner_radius: 1 bounds: { x: 0, y: 0, width: 120.5853, height: 52 } views: diff --git a/data/keyboards/us.yaml b/data/keyboards/us.yaml index ac38fa59..13d8bafe 100644 --- a/data/keyboards/us.yaml +++ b/data/keyboards/us.yaml @@ -3,19 +3,14 @@ bounds: { x: 0, y: 1, width: 360, height: 198 } outlines: default: - corner_radius: 1 bounds: { x: 0, y: 0, width: 30.67, height: 40.67 } altline: - corner_radius: 1 bounds: { x: 0, y: 0, width: 48, height: 40.67 } wide: - corner_radius: 1 bounds: { x: 0, y: 0, width: 57.33, height: 40.67 } spaceline: - corner_radius: 1 bounds: { x: 0, y: 0, width: 137.33, height: 40.67 } special: - corner_radius: 1 bounds: { x: 0, y: 0, width: 39.33, height: 40.67 } views: diff --git a/src/data.rs b/src/data.rs index 595b20df..f72fa4e4 100644 --- a/src/data.rs +++ b/src/data.rs @@ -218,7 +218,6 @@ enum Action { #[derive(Debug, Clone, Deserialize, PartialEq)] #[serde(deny_unknown_fields)] struct Outline { - corner_radius: f64, bounds: Bounds, } @@ -469,7 +468,6 @@ fn create_button( .unwrap_or_else(|| { eprintln!("No default outline defied Using 1x1!"); Outline { - corner_radius: 0f64, bounds: Bounds { x: 0f64, y: 0f64, width: 1f64, height: 1f64 }, } }); @@ -483,7 +481,6 @@ fn create_button( width: outline.bounds.width, height: outline.bounds.height, }, - corner_radius: outline.corner_radius, label: label, state: state, } @@ -517,7 +514,6 @@ mod tests { }, outlines: hashmap!{ "default".into() => Outline { - corner_radius: 1f64, bounds: Bounds { x: 0f64, y: 0f64, width: 0f64, height: 0f64 }, diff --git a/src/imservice.rs b/src/imservice.rs index 82cce3a7..d3e4c5d0 100644 --- a/src/imservice.rs +++ b/src/imservice.rs @@ -3,7 +3,6 @@ use std::ffi::CString; use std::num::Wrapping; use std::string::String; -use super::bitflags; use ::util::c::into_cstring; // Traits diff --git a/src/layout.rs b/src/layout.rs index a0009b47..05074d5a 100644 --- a/src/layout.rs +++ b/src/layout.rs @@ -498,7 +498,6 @@ pub mod c { ) -> Box