Skip to content

Commit d83a5cd

Browse files
committed
add more inner variable, replace the snapshot
1 parent 40bcb64 commit d83a5cd

5 files changed

Lines changed: 58 additions & 19 deletions

File tree

layouts/60_2.tvkl

Lines changed: 0 additions & 17 deletions
This file was deleted.

layouts/60_blue.tvkl

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#border_color = @($40, $48, $60)
2+
#highlight = @($0, $220, $255)
3+
#fps_color = @($120, $200, $255)
4+
5+
#fn_border = @($90, $90, $120)
6+
#fn_highlight = @($180, $0, $255)
7+
8+
#esc_color = @($180, $90, $255)
9+
#enter_color = @($255, $170, $80)
10+
#space_color = @($120, $180, $255)
11+
12+
#esc_len = $6
13+
#mod_len = $7
14+
#space_len = $21
15+
16+
:| Esc [#esc_len,,#esc_color]
17+
| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0
18+
| '-' | '='
19+
| Back [$9,,#fn_border] |-
20+
21+
:| Tab [$8,,#fn_border]
22+
| Q | W | E | R | T | Y | U | I | O | P
23+
| '[' | ']'
24+
| '\' [$7,,#fn_border] |-
25+
26+
:| Caps [$10,,#fn_border]
27+
| A | S | D | F | G | H | J | K | L
28+
| ';' | "'"
29+
| Enter [$10,,#enter_color] |-
30+
31+
:| LShift [$12,,#fn_border]
32+
| Z | X | C | V | B | N | M
33+
| ',' | '.' | '/'
34+
| RShift [$13,,#fn_border] |-
35+
36+
:| LCtrl [#mod_len,,#fn_border]
37+
| Win [$5,,#fn_border]
38+
| LAlt [#mod_len,,#fn_border]
39+
| Space [#space_len,,#space_color]
40+
| RAlt [#mod_len,,#fn_border]
41+
| Win [$5,,#fn_border]
42+
| App [$6,,#fn_border]
43+
| RCtrl [#mod_len,,#fn_border] |-

snapshot.png

260 Bytes
Loading

src/parser.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ impl Parser {
139139
}
140140

141141
fn parse_attr(&mut self, attr: &mut Attr, env: &Env) -> Result<(), ParserError> {
142+
// [width, height, border_color, highlight]
142143
self.consume(TokenType::LBracket)?; // [
143144

144145
let mut pos = 0;

src/render.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pub fn render_ui(
1717

1818
// Resolve Global Defaults from Env
1919
let default_border_color = Color::Rgb(176, 176, 176);
20+
let default_fps_color = Color::Yellow;
2021
let global_border_color = match env.get("border_color") {
2122
Some(Value::RGB(r, g, b)) => Color::Rgb(*r, *g, *b),
2223
_ => default_border_color,
@@ -28,12 +29,23 @@ pub fn render_ui(
2829
_ => default_highlight,
2930
};
3031

32+
let outer_border_color = match env.get("outer_border_color") {
33+
Some(Value::RGB(r, g, b)) => Color::Rgb(*r, *g, *b),
34+
_ => global_border_color,
35+
};
36+
37+
let fps_color= match env.get("fps_color") {
38+
Some(Value::RGB(r, g, b)) => Color::Rgb(*r, *g, *b),
39+
_ => default_fps_color,
40+
};
41+
42+
3143
// Render Outer Container
3244
let outer_block = Block::default()
3345
.borders(Borders::ALL)
3446
.title(" Terminal Virtual Keyboard ")
3547
.border_type(BorderType::Thick)
36-
.border_style(Style::default().fg(global_border_color));
48+
.border_style(Style::default().fg(outer_border_color));
3749

3850
let inner_area = outer_block.inner(area);
3951
f.render_widget(outer_block, area);
@@ -50,7 +62,7 @@ pub fn render_ui(
5062
.alignment(Alignment::Right)
5163
.style(
5264
Style::default()
53-
.fg(Color::Yellow)
65+
.fg(fps_color)
5466
.add_modifier(Modifier::BOLD),
5567
),
5668
chunks[0],

0 commit comments

Comments
 (0)