Skip to content

Commit 999b2e6

Browse files
ids1024jackpot51
authored andcommitted
improv: Make DaemonDummy::new() take argument for list of boards
1 parent cc7113d commit 999b2e6

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/application/layout/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ macro_rules! keyboards {
3434
}
3535
}
3636

37-
pub fn layouts() -> &'static [&'static str] {
37+
pub(super) fn layouts() -> &'static [&'static str] {
3838
&[$( $board ),*]
3939
}
4040
};

src/application/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ fn main_app(app: &gtk::Application, daemon: Rc<dyn Daemon>) {
6969
if count == 0 {
7070
eprintln!("Failed to locate any keyboards, showing demo");
7171

72-
let daemon = Rc::new(DaemonDummy::new());
72+
let board_names = layout::layouts().iter().map(|s| s.to_string()).collect();
73+
let daemon = Rc::new(DaemonDummy::new(board_names));
7374
let boards = daemon.boards().unwrap();
7475

7576
for (i, board) in boards.iter().enumerate() {

src/daemon/dummy.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ impl DaemonDummy {
2929
}
3030

3131
impl DaemonDummy {
32-
pub fn new() -> Self {
33-
let board_names: Vec<_> = layout::layouts().iter().map(|s| s.to_string()).collect();
32+
pub fn new(board_names: Vec<String>) -> Self {
3433
let boards = board_names.iter().map(|_| BoardDummy::default()).collect();
3534
Self {
3635
board_names,
@@ -80,4 +79,4 @@ impl Daemon for DaemonDummy {
8079
fn exit(&self) -> Result<(), String> {
8180
Ok(())
8281
}
83-
}
82+
}

0 commit comments

Comments
 (0)