mirror of
https://codeberg.org/unspeaker/tengri.git
synced 2025-12-06 11:46:42 +01:00
Compare commits
4 commits
a55e84c29f
...
f21781e816
| Author | SHA1 | Date | |
|---|---|---|---|
| f21781e816 | |||
| 12998a94ea | |||
| b127526570 | |||
| c9f0164871 |
4 changed files with 17 additions and 16 deletions
|
|
@ -25,9 +25,10 @@ try_from_expr!(<'source, 'state, E>: Bsp<RenderBox<'state, E>, RenderBox<'state,
|
|||
if let Some(Token { value: Value::Key(key), .. }) = iter.peek() {
|
||||
match key {
|
||||
"bsp/n"|"bsp/s"|"bsp/e"|"bsp/w"|"bsp/a"|"bsp/b" => {
|
||||
let _ = iter.next().unwrap();
|
||||
let c1 = iter.next().expect("no content1 specified");
|
||||
let c2 = iter.next().expect("no content2 specified");
|
||||
let original = iter.clone();
|
||||
let _ = iter.next().unwrap();
|
||||
let c1 = iter.next().unwrap_or_else(||panic!("no content1 specified: {original:?}"));
|
||||
let c2 = iter.next().unwrap_or_else(||panic!("no content2 specified: {original:?}"));
|
||||
let c1 = state.get_content(&c1.value).expect("no content1 provided");
|
||||
let c2 = state.get_content(&c2.value).expect("no content2 provided");
|
||||
return Some(match key {
|
||||
|
|
|
|||
|
|
@ -36,15 +36,13 @@ try_from_expr!(<'source, 'state, E>: When<RenderBox<'state, E>>: |state, iter| {
|
|||
try_from_expr!(<'source, 'state, E>: Either<RenderBox<'state, E>, RenderBox<'state, E>>: |state, iter| {
|
||||
if let Some(Token { value: Value::Key("either"), .. }) = iter.peek() {
|
||||
let _ = iter.next().unwrap();
|
||||
let content = iter.next().expect("no content specified").value;
|
||||
let alternate = iter.next().expect("no alternate specified").value;
|
||||
//panic!("{iter:?}");
|
||||
return Some(Self(
|
||||
state.get(&mut iter)
|
||||
.expect("no condition provided"),
|
||||
state.get_content(&content)
|
||||
.unwrap_or_else(||panic!("no content 1 corresponding to {:?}", &content)),
|
||||
state.get_content(&alternate)
|
||||
.unwrap_or_else(||panic!("no content 2 corresponding to {:?}", &alternate)),
|
||||
state.get(&mut iter).expect("no condition provided"),
|
||||
state.get_content(&iter.next().expect("no content specified").value)
|
||||
.unwrap_or_else(||panic!("no content 1: {iter:?}")),
|
||||
state.get_content(&iter.next().expect("no alternate specified").value)
|
||||
.unwrap_or_else(||panic!("no content 2: {iter:?}")),
|
||||
))
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -103,9 +103,9 @@ impl ItemTheme {
|
|||
let mut builder = konst::array::ArrayBuilder::new();
|
||||
while !builder.is_full() {
|
||||
let index = builder.len() as u8;
|
||||
let light = (index as f64 * 1.3) as u8;
|
||||
let lighter = (index as f64 * 1.6) as u8;
|
||||
let lightest = (index as f64 * 1.9) as u8;
|
||||
let light = (index as f64 * 1.15) as u8;
|
||||
let lighter = (index as f64 * 1.7) as u8;
|
||||
let lightest = (index as f64 * 1.85) as u8;
|
||||
let dark = (index as f64 * 0.9) as u8;
|
||||
let darker = (index as f64 * 0.6) as u8;
|
||||
let darkest = (index as f64 * 0.3) as u8;
|
||||
|
|
|
|||
|
|
@ -68,8 +68,10 @@ impl KeyMatcher {
|
|||
"backtick" => Char('`'),
|
||||
"lt" => Char('<'),
|
||||
"gt" => Char('>'),
|
||||
"openbracket" => Char('['),
|
||||
"closebracket" => Char(']'),
|
||||
"cbopen" | "openbrace" => Char('{'),
|
||||
"cbclose" | "closebrace" => Char('}'),
|
||||
"bropen" | "openbracket" => Char('['),
|
||||
"brclose" | "closebracket" => Char(']'),
|
||||
"pgup" | "pageup" => PageUp,
|
||||
"pgdn" | "pagedown" => PageDown,
|
||||
"f1" => F(1),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue