rust/playmat
1
0
Fork 0
Code Issues 2 Pull Requests Releases 1 Wiki Activity

refactors cell content updating

Browse Source
This commit is contained in:
Arthur Gerbaud
2019-06-06 21:28:02 +02:00
parent c67c4145a7
commit 1223167405
2 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main.rs
View File

@@ -68,7 +68,6 @@ impl App {
.get_object("app")
.unwrap();
win.set_application(app);
// Set up a simple switch for the Pawn list panel
let panel: gtk::Paned = builder.get_object("panel").unwrap();
Self::new_action(app, "panel_switch", move |_,_| {
@@ -78,18 +77,7 @@ impl App {
panel.set_position(0);
}
});
// Initialize grid
let grid: gtk::Grid = builder.get_object("map").unwrap();
// TODO: implement drag-drop events
// * From pawn_list to cell : place pawn on dest cell
// * From cell to cell : move pawn from source to dest cell
let _grid = grid::Grid::init(grid, 10, app_state.clone());
// TODO:
// * Display creature description when hovering over its position (cell)
// TODO: Pawn list
// Pawn list
let pawn_list = builder.get_object("pawn_list").unwrap();
let pawn_list = pawn::PawnList::init(pawn_list);
@@ -99,7 +87,14 @@ impl App {
pawn.connect_stats();
app_state.borrow_mut().pawns.push(pawn);
}
win.show_all();
win.show_all(); // Before grid because we want to hide some widgets there
// Initialize grid
let grid: gtk::Grid = builder.get_object("map").unwrap();
// TODO: implement drag-drop events
// * From pawn_list to cell : place pawn on dest cell
// * From cell to cell : move pawn from source to dest cell
let _grid = grid::Grid::init(grid, 10, app_state.clone());
}
);
}