fix typo tailed -> tiled (software-mansion#202)

nickdichev-firework · Oct 10, 2023 · 82879bf · 82879bf
1 parent 97b9a35
commit 82879bf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/compositor_common/src/scene/builtin_transformations.rs b/compositor_common/src/scene/builtin_transformations.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 use serde_with::{DeserializeFromStr, SerializeDisplay};
 
 use crate::error::BuiltinSpecValidationError;
-use crate::scene::builtin_transformations::tailed_layout::TailedLayoutSpec;
+use crate::scene::builtin_transformations::tiled_layout::TiledLayoutSpec;
 use crate::scene::constraints::input_count::InputCountConstraint;
 use crate::util::align::HorizontalAlign;
 use crate::util::align::VerticalAlign;
@@ -17,7 +17,7 @@ use super::NodeSpec;
 use super::Resolution;
 
 pub(crate) mod fixed_postion_layout;
-pub mod tailed_layout;
+pub mod tiled_layout;
 
 pub use fixed_postion_layout::FixedPositionLayoutSpec;
 pub use fixed_postion_layout::TextureLayout;
@@ -34,7 +34,7 @@ pub enum BuiltinSpec {
         strategy: TransformToResolutionStrategy,
     },
     FixedPositionLayout(FixedPositionLayoutSpec),
-    TiledLayout(TailedLayoutSpec),
+    TiledLayout(TiledLayoutSpec),
     MirrorImage {
         #[serde(default)]
         mode: MirrorMode,

diff --git a/.../builtin_transformations/tailed_layout.rs → ...e/builtin_transformations/tiled_layout.rs b/.../builtin_transformations/tailed_layout.rs → ...e/builtin_transformations/tiled_layout.rs
@@ -4,7 +4,7 @@ use crate::{scene::Resolution, util::align::HorizontalAlign};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
-pub struct TailedLayoutSpec {
+pub struct TiledLayoutSpec {
     #[serde(default)]
     pub background_color_rgba: RGBAColor,
     #[serde(default = "default_tile_aspect_ratio")]

diff --git a/compositor_render/src/transformations/builtin/params.rs b/compositor_render/src/transformations/builtin/params.rs
@@ -11,7 +11,7 @@ use self::{
     corners_rounding::CornersRoundingParams,
     fixed_position_layout::new_fixed_position_layout_params,
     mirror_image::MirrorModeExt,
-    tiled_layout::new_tailed_layout_params,
+    tiled_layout::new_tiled_layout_params,
     transform_to_resolution::{new_fit_to_resolution_params, FillParams},
 };
 
@@ -77,7 +77,7 @@ impl RenderParams {
                 RenderParams::BoxLayout(new_fixed_position_layout_params(spec, input_resolutions))
             }
             BuiltinSpec::TiledLayout(spec) => {
-                RenderParams::BoxLayout(new_tailed_layout_params(spec, input_resolutions))
+                RenderParams::BoxLayout(new_tiled_layout_params(spec, input_resolutions))
             }
             BuiltinSpec::MirrorImage { mode } => RenderParams::MirrorMode(*mode),
             BuiltinSpec::CornersRounding { border_radius } => RenderParams::CornersRounding(

diff --git a/compositor_render/src/transformations/builtin/params/tiled_layout.rs b/compositor_render/src/transformations/builtin/params/tiled_layout.rs
@@ -1,5 +1,5 @@
 use compositor_common::{
-    scene::{builtin_transformations::tailed_layout::TailedLayoutSpec, Resolution},
+    scene::{builtin_transformations::tiled_layout::TiledLayoutSpec, Resolution},
     util::align::{HorizontalAlign, VerticalAlign},
 };
 
@@ -20,8 +20,8 @@ impl RowsCols {
     }
 }
 
-pub fn new_tailed_layout_params(
-    spec: &TailedLayoutSpec,
+pub fn new_tiled_layout_params(
+    spec: &TiledLayoutSpec,
     input_resolutions: &[Option<Resolution>],
 ) -> BoxLayoutParams {
     let inputs = input_resolutions
@@ -60,7 +60,7 @@ fn layout_tiles(
     inputs_count: u32,
     rows_cols: &RowsCols,
     tile_size: Resolution,
-    spec: &TailedLayoutSpec,
+    spec: &TiledLayoutSpec,
 ) -> Vec<BoxLayout> {
     let mut layouts = Vec::with_capacity(inputs_count as usize);
 
@@ -130,7 +130,7 @@ fn layout_tiles(
     layouts
 }
 
-fn tile_size(rows_cols: &RowsCols, spec: &TailedLayoutSpec) -> Resolution {
+fn tile_size(rows_cols: &RowsCols, spec: &TiledLayoutSpec) -> Resolution {
     let x_padding = (rows_cols.cols * 2 * spec.padding) as f32;
     let y_padding = (rows_cols.rows * 2 * spec.padding) as f32;
     let x_margin = ((rows_cols.cols + 1) * spec.margin) as f32;
@@ -153,7 +153,7 @@ fn tile_size(rows_cols: &RowsCols, spec: &TailedLayoutSpec) -> Resolution {
 
 /// Optimize number of rows and cols to maximize space covered by tiles,
 /// preserving tile aspect_ratio
-fn optimize_inputs_layout(inputs_count: u32, spec: &TailedLayoutSpec) -> RowsCols {
+fn optimize_inputs_layout(inputs_count: u32, spec: &TiledLayoutSpec) -> RowsCols {
     let mut best_rows_cols = RowsCols::from_rows_count(inputs_count, 1);
     let mut best_tile_width = 0;