summaryrefslogtreecommitdiff
path: root/src/layout
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2021-05-27 14:48:45 +0200
committerLaurenz <laurmaedje@gmail.com>2021-05-27 14:48:45 +0200
commitb886ced40825372000df0fa9cddff98a1b642cc6 (patch)
tree6baf23b24c90352f3712f0e8eda57decf913181a /src/layout
parent9e0a34c80f2fa48ada3a0ed0c985c8daa2ae7de3 (diff)
Switch to N64 type alias
Diffstat (limited to 'src/layout')
-rw-r--r--src/layout/mod.rs4
-rw-r--r--src/layout/stack.rs8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index 51b9bc64..a025fbc2 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -20,7 +20,7 @@ use std::any::Any;
use std::fmt::{self, Debug, Formatter};
use std::hash::{Hash, Hasher};
-use decorum::NotNan;
+use decorum::N64;
use fxhash::FxHasher64;
use crate::cache::{Cache, FramesEntry};
@@ -257,7 +257,7 @@ impl Regions {
}
/// Shrink `current` to ensure that the aspect ratio can be satisfied.
- pub fn apply_aspect_ratio(&mut self, aspect: NotNan<f64>) {
+ pub fn apply_aspect_ratio(&mut self, aspect: N64) {
let width = self.current.width.min(aspect.into_inner() * self.current.height);
let height = width / aspect.into_inner();
self.current = Size::new(width, height);
diff --git a/src/layout/stack.rs b/src/layout/stack.rs
index bb767378..410f53c6 100644
--- a/src/layout/stack.rs
+++ b/src/layout/stack.rs
@@ -1,4 +1,4 @@
-use decorum::NotNan;
+use decorum::N64;
use super::*;
@@ -13,7 +13,7 @@ pub struct StackNode {
/// The fixed aspect ratio between width and height, if any.
///
/// The resulting frames will satisfy `width = aspect * height`.
- pub aspect: Option<NotNan<f64>>,
+ pub aspect: Option<N64>,
/// The nodes to be stacked.
pub children: Vec<StackChild>,
}
@@ -58,7 +58,7 @@ impl From<StackNode> for AnyNode {
struct StackLayouter {
dirs: Gen<Dir>,
- aspect: Option<NotNan<f64>>,
+ aspect: Option<N64>,
main: SpecAxis,
regions: Regions,
finished: Vec<Frame>,
@@ -69,7 +69,7 @@ struct StackLayouter {
}
impl StackLayouter {
- fn new(dirs: Gen<Dir>, aspect: Option<NotNan<f64>>, mut regions: Regions) -> Self {
+ fn new(dirs: Gen<Dir>, aspect: Option<N64>, mut regions: Regions) -> Self {
if let Some(aspect) = aspect {
regions.apply_aspect_ratio(aspect);
}