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

adds basics of pawn's placement

Browse Source
This commit is contained in:
Arthur Gerbaud
2019-06-05 16:20:23 +02:00
parent 525babba5b
commit 9b79004b54
3 changed files with 207 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
src/main.rs
View File

@@ -3,109 +3,44 @@ extern crate gio;
extern crate gdk;
extern crate glib;
use gtk::BoxExt;
use std::cell::RefCell;
use std::rc::Rc;
use gtk::prelude::*;
use gio::prelude::*;
use std::env::args;
use std::process;
mod grid;
mod pawn;
mod pawn {
use super::*;
#[derive(Debug,Clone)]
pub struct PawnList {
inner: gtk::ListBox,
}
impl PawnList {
pub fn init(inner: gtk::ListBox) -> Self {
PawnList{ inner }
}
pub fn add(&self, pawn: &Pawn) {
let row = gtk::ListBoxRow::new();
row.add(pawn.as_ref());
self.inner.add(&row);
}
}
struct PawnData {
name: String,
}
pub struct Pawn {
data: PawnData,
widget: gtk::Box,
}
impl Pawn {
pub fn new<S: Into<String>>(name: S) -> Self {
let pawn_src = include_str!("../res/pawn.glade");
let builder = gtk::Builder::new_from_string(pawn_src);
let name = name.into();
let label: gtk::Label =
builder
.get_object("name")
.unwrap();
label.set_text(&name);
let place_btn: gtk::Button =
builder
.get_object("place_btn")
.unwrap();
place_btn.connect_clicked(|_| {
println!("Placing...");
});
let stats_btn: gtk::Button =
builder
.get_object("stats_btn")
.unwrap();
stats_btn.connect_clicked(|_| {
println!("Showing stats...");
});
let widget: gtk::Box = builder.get_object("pawn").unwrap();
Pawn {
data: PawnData{ name },
widget,
}
}
}
impl AsRef<gtk::Box> for Pawn {
fn as_ref(&self) -> &gtk::Box {
&self.widget
}
}
pub fn pawn_factory() -> Vec<Pawn> {
let mut pawns = Vec::with_capacity(3);
for name in &["Lomion", "Oilosse", "Fefi"] {
pawns.push(Pawn::new(*name));
}
pawns
}
#[cfg(test)]
mod tests {
#[test]
fn test_pawn_factory() {
let pawns = pawn_factory();
assert_eq!(pawns.len(), 3);
assert_eq!(pawns.get(2).unwrap(), "Fefi");
}
}
/// Content of the Application state
///
#[derive(Debug,Clone,Default)]
pub struct AppData {
/// A slot for any pawn waiting for placement
pending: Option<pawn::PawnData>,
/// Owned list of pawns
pawns: Vec<pawn::Pawn>,
}
/// A sharable state for the whole application
#[derive(Debug,Clone,Default)]
pub struct AppState(Rc<RefCell<AppData>>);
impl std::ops::Deref for AppState {
type Target = Rc<RefCell<AppData>>;
fn deref(&self) -> &Self::Target {
&self.0
}
}
struct App {
inner: gtk::Application,
pawns: Vec<pawn::Pawn>,
state: AppState,
}
impl App {
fn new<'a>() -> Result<Self, &'a str> {
let app =
@@ -114,55 +49,63 @@ impl App {
"home.local.PlayMat",
gio::ApplicationFlags::FLAGS_NONE
).expect("Failed to build Application"),
pawns: Vec::new(),
state: Default::default(),
};
app.inner.connect_startup(|_| {});
app.inner.connect_activate(Self::on_activate);
app.connect_all();
Ok(app)
}
fn on_activate(app: &gtk::Application) {
println!("Activate App");
let main_src = include_str!("../res/main.glade");
let builder = gtk::Builder::new_from_string(main_src);
let win: gtk::ApplicationWindow =
builder
.get_object("app")
.unwrap();
win.set_application(app);
fn connect_all(&self) {
let app_state = self.state.clone();
self.inner.connect_startup(|_| {});
self.inner.connect_activate(
move |app| {
println!("Activate App");
let main_src = include_str!("../res/main.glade");
let builder = gtk::Builder::new_from_string(main_src);
let win: gtk::ApplicationWindow =
builder
.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 |_,_| {
if panel.get_position() == 0 {
panel.set_position(360);
} else {
panel.set_position(0);
// 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 |_,_| {
if panel.get_position() == 0 {
panel.set_position(360);
} else {
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
let pawn_list = builder.get_object("pawn_list").unwrap();
let pawn_list = pawn::PawnList::init(pawn_list);
for pawn in pawn::pawn_factory() {
pawn_list.add(&pawn);
pawn.connect_place(app_state.clone());
pawn.connect_stats();
app_state.borrow_mut().pawns.push(pawn);
}
win.show_all();
}
});
// 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);
// TODO:
// * Display creature description when hovering over its position (cell)
// TODO: Pawn list
let pawn_list = builder.get_object("pawn_list").unwrap();
let pawn_list = pawn::PawnList::init(pawn_list);
for pawn in &pawn::pawn_factory() {
pawn_list.add(pawn);
}
win.show_all();
);
}
/// Creates a simple action and connects the given handler to its activate signal.
pub fn new_action<F: Fn(&gio::SimpleAction, &Option<glib::Variant>) + 'static>(
fn new_action<F: Fn(&gio::SimpleAction, &Option<glib::Variant>) + 'static>(
app: &gtk::Application,
name: &str,
f: F,
@@ -173,6 +116,7 @@ impl App {
}
fn run(&self, args: &[String]) -> i32 {
println!("{:#?}", &self.state);
self.inner.run(args)
}
}