mirror of
https://codeberg.org/unspeaker/tengri.git
synced 2026-08-28 05:06:56 +02:00
update signatures of layout modifiers
This commit is contained in:
parent
e69d4287e0
commit
41ef62146b
6 changed files with 18 additions and 18 deletions
|
|
@ -138,7 +138,7 @@ where
|
|||
+ Namespace<O::Unit>
|
||||
+ Namespace<Option<O::Unit>>
|
||||
{
|
||||
let thunk = draw(move|screen|ok_flat(expr.nth(1)?.map(|x: &'a str|state.interpret(screen, x))));
|
||||
let thunk = draw(move|screen|ok_flat(expr.nth(1)?.map(|x|state.interpret(screen, x))));
|
||||
Ok(match expr.head()? {
|
||||
Some("full/x") | Some("full/w") => Full::W(thunk).draw(to)?,
|
||||
Some("full/y") | Some("full/h") => Full::H(thunk).draw(to)?,
|
||||
|
|
@ -157,7 +157,7 @@ where
|
|||
+ Namespace<O::Unit>
|
||||
+ Namespace<Option<O::Unit>>
|
||||
{
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x: &'a str|state.interpret(screen, x))));
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x|state.interpret(screen, x))));
|
||||
Ok(match expr.head()? {
|
||||
Some("exact/w") => thunk.exact_w(
|
||||
state.namespace(&expr.nth(1)?)?
|
||||
|
|
@ -183,7 +183,7 @@ where
|
|||
+ Namespace<O::Unit>
|
||||
+ Namespace<Option<O::Unit>>
|
||||
{
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x: &'a str|state.interpret(screen, x))));
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x|state.interpret(screen, x))));
|
||||
Ok(match expr.head()? {
|
||||
Some("min/w") => thunk.min_w(
|
||||
state.namespace(&expr.nth(1)?)?
|
||||
|
|
@ -209,7 +209,7 @@ where
|
|||
+ Namespace<O::Unit>
|
||||
+ Namespace<Option<O::Unit>>
|
||||
{
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x: &'a str|state.interpret(screen, x))));
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x|state.interpret(screen, x))));
|
||||
Ok(match expr.head()? {
|
||||
Some("max/w") => thunk.max_w(
|
||||
state.namespace(&expr.nth(1)?)?
|
||||
|
|
@ -235,7 +235,7 @@ where
|
|||
+ Namespace<O::Unit>
|
||||
+ Namespace<Option<O::Unit>>
|
||||
{
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x: &'a str|state.interpret(screen, x))));
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x|state.interpret(screen, x))));
|
||||
Ok(match expr.head()? {
|
||||
Some("push/w") => thunk.push_x(state.namespace(&expr.nth(1)?)?).draw(to)?,
|
||||
Some("push/h") => thunk.push_y(state.namespace(&expr.nth(1)?)?).draw(to)?,
|
||||
|
|
@ -257,7 +257,7 @@ where
|
|||
+ Namespace<O::Unit>
|
||||
+ Namespace<Option<O::Unit>>
|
||||
{
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x: &'a str|state.interpret(screen, x))));
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x|state.interpret(screen, x))));
|
||||
Ok(match expr.head()? {
|
||||
Some("pull/w") => thunk.pull_x(state.namespace(&expr.nth(1)?)?).draw(to)?,
|
||||
Some("pull/h") => thunk.pull_y(state.namespace(&expr.nth(1)?)?).draw(to)?,
|
||||
|
|
@ -279,7 +279,7 @@ where
|
|||
+ Namespace<O::Unit>
|
||||
+ Namespace<Option<O::Unit>>
|
||||
{
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x: &'a str|state.interpret(screen, x))));
|
||||
let thunk = draw(move|screen|ok_flat(expr.last()?.map(|x|state.interpret(screen, x))));
|
||||
Ok(match expr.head()? {
|
||||
Some("pad/w") => thunk.pad_w(
|
||||
state.namespace(&expr.nth(1)?)?
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue