Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to new toss commit

Browse source
This commit is contained in:
Joscha 2022-07-04 19:40:11 +02:00
parent 11422801b0
commit 93cc2a6c13
12 changed files with 62 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ui/room.rs
View file

@ -1,7 +1,6 @@
use std::sync::Arc;
use crossterm::event::{KeyCode, KeyEvent};
use crossterm::style::ContentStyle;
use parking_lot::FairMutex;
use tokio::sync::mpsc;
use toss::frame::{Frame, Pos, Size};
@ -80,8 +79,8 @@ impl EuphRoom {
// Clear area in case something accidentally wrote on it already
let size = frame.size();
for x in 0..size.width as i32 {
frame.write(Pos::new(x, 0), " ", ContentStyle::default());
frame.write(Pos::new(x, 1), "─", ContentStyle::default());
frame.write(Pos::new(x, 0), " ");
frame.write(Pos::new(x, 1), "─");
}
// Write status
@ -104,7 +103,7 @@ impl EuphRoom {
}
}
};
frame.write(Pos::new(0, 0), &status, ContentStyle::default());
frame.write(Pos::new(0, 0), status);
}
pub async fn handle_key_event(

4
src/ui/rooms.rs
View file

@ -145,7 +145,7 @@ impl Rooms {
};
for x in 0..size.width {
frame.write(Pos::new(x.into(), y), " ", style);
frame.write(Pos::new(x.into(), y), (" ", style));
}
let suffix = if let Some(room) = self.euph_rooms.get(room) {
if room.connected() {
@ -157,7 +157,7 @@ impl Rooms {
""
};
let room_str = format!("&{room}{suffix}");
frame.write(Pos::new(0, y), &room_str, style);
frame.write(Pos::new(0, y), (&room_str, style));
}
}