Merge branch 'corners' into 'master'

display: Remove unused corner_radius

See merge request Librem5/squeekboard!174

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:

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:

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:

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
                         }, 

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

src/layout.rs

@@ -498,7 +498,6 @@ pub mod c {
         ) -> Box<Button> {
             Box::new(Button {
                 name: CString::new(name.clone()).unwrap(),
-                corner_radius: 0f64,
                 bounds: c::Bounds {
                     x: 0f64, y: 0f64, width: 0f64, height: 0f64
                 },
@@ -561,7 +560,6 @@ pub struct Button {
     pub name: CString,
     /// Label to display to the user
     pub label: Label,
-    pub corner_radius: f64,
     /// TODO: position the buttons before they get initial bounds
     /// Position relative to some origin (i.e. parent/row)
     pub bounds: c::Bounds,

tests/layout.yaml

@@ -9,7 +9,6 @@ views:
         - "test"
 outlines:
     default:
-        corner_radius: 1
         bounds: { x: 0, y: 0, width: 0, height: 0 }
 
 buttons:

tests/layout2.yaml

@@ -7,6 +7,5 @@ bounds:
     height: 0
 outlines:
     default:
-        corner_radius: 1
         bounds: { x: 0, y: 0, width: 0, height: 0 }
 

tests/layout3.yaml

@@ -10,7 +10,6 @@ views:
         - "test"
 outlines:
     default:
-        corner_radius: 1
         bounds: { x: 0, y: 0, width: 0, height: 0 }
 
 bad_field: false

tests/layout_key1.yaml

@@ -10,7 +10,6 @@ views:
         - "."
 outlines:
     default:
-        corner_radius: 1
         bounds: { x: 0, y: 0, width: 0, height: 0 }
 
 buttons:

tests/layout_key2.yaml

@@ -10,7 +10,6 @@ views:
         - "å"
 outlines:
     default:
-        corner_radius: 1
         bounds: { x: 0, y: 0, width: 0, height: 0 }
 
 buttons: