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

adds rustfmt config, formats current code

Browse Source
This commit is contained in:
Arthur Gerbaud
2019-06-07 09:05:12 +02:00
parent 664c10359d
commit b476da7371
4 changed files with 94 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/grid.rs
View File

@@ -4,7 +4,7 @@ pub struct Grid {
inner: gtk::Grid,
}
#[derive(Debug,Copy,Clone)]
#[derive(Debug, Copy, Clone)]
pub struct CellPosition(i32, i32);
impl Grid {
@@ -14,9 +14,7 @@ impl Grid {
for i in 0..(size * size) {
let x = i % size;
let y = i / size;
let cell = grid::Cell::new(
CellPosition(x,y)
);
let cell = grid::Cell::new(CellPosition(x, y));
cell.inner.connect_clicked(app_state.clone());
inner.attach(cell.as_ref(), x, y, 1, 1);
}
@@ -24,11 +22,11 @@ impl Grid {
}
}
#[derive(Debug,Clone)]
#[derive(Debug, Clone)]
struct CellWidget {
eventbox: gtk::EventBox,
position: gtk::Label,
header : gtk::Label,
header: gtk::Label,
desc_btn: gtk::Button,
}
@@ -37,24 +35,12 @@ impl CellWidget {
let cell_src = include_str!("../res/cell.glade");
let builder = gtk::Builder::new_from_string(cell_src);
// Retrieve children
let eventbox: gtk::EventBox =
builder
.get_object("cell")
.unwrap();
let header: gtk::Label =
builder
.get_object("header")
.unwrap();
let eventbox: gtk::EventBox = builder.get_object("cell").unwrap();
let header: gtk::Label = builder.get_object("header").unwrap();
header.set_text(header_text);
let position: gtk::Label =
builder
.get_object("position")
.unwrap();
let position: gtk::Label = builder.get_object("position").unwrap();
position.set_text(&format!("{}x{}", pos.0, pos.1));
let desc_btn: gtk::Button =
builder
.get_object("desc_btn")
.unwrap();
let desc_btn: gtk::Button = builder.get_object("desc_btn").unwrap();
desc_btn.set_visible(false);
let cell = CellWidget {
eventbox,
@@ -64,9 +50,11 @@ impl CellWidget {
};
// Drag-and-drop capacity
// The data to be sent
let targets = vec![
gtk::TargetEntry::new("text/plain", gtk::TargetFlags::SAME_APP, 0)
];
let targets = vec![gtk::TargetEntry::new(
"text/plain",
gtk::TargetFlags::SAME_APP,
0,
)];
// Acting as source
cell.eventbox.drag_source_set(
gdk::ModifierType::MODIFIER_MASK,
@@ -75,24 +63,21 @@ impl CellWidget {
);
let h = cell.header.clone();
// Send data to the drop site
cell.eventbox.connect_drag_data_get(
move |_,_,data,info,time| {
cell.eventbox
.connect_drag_data_get(move |_, _, data, info, time| {
println!("Send...");
// TODO: Refactoring, this is the inverse of 'placing',
// building a PawnData instead of destructuring it.
if let Some(to_send) = h.get_text() {
data.set_text(&to_send);
}
}
);
});
let c = cell.clone();
// Empty the cell on successfull move
cell.eventbox.connect_drag_data_delete(
move |w,drag| {
println!("Cleaning... {:#?}", (&drag.drag_drop_succeeded()));
Self::set_content(&c, None);
}
);
cell.eventbox.connect_drag_data_delete(move |w, drag| {
println!("Cleaning... {:#?}", (&drag.drag_drop_succeeded()));
Self::set_content(&c, None);
});
// Acting as destination
cell.eventbox.drag_dest_set(
gtk::DestDefaults::ALL,
@@ -101,8 +86,8 @@ impl CellWidget {
);
// Retrieve data from the source
let c = cell.clone();
cell.eventbox.connect_drag_data_received(
move |w,_,_,_,data,_,_| {
cell.eventbox
.connect_drag_data_received(move |w, _, _, _, data, _, _| {
// Check if cell is not already occupied
if !(c.header.get_text().unwrap().as_str() == "") {
// TODO: Find what to do to abort, since
@@ -116,8 +101,7 @@ impl CellWidget {
eprintln!("No data !");
}
};
}
);
});
cell
}
@@ -136,15 +120,14 @@ impl CellWidget {
pub fn connect_clicked(&self, state: AppState) {
let c = self.clone();
self.eventbox
.connect_button_press_event(move |_,_| {
let mut state = state.borrow_mut();
if let Some(ref data) = state.pending.take() {
println!("{:?}", data);
Self::set_content(&c, Some(&data.name));
};
gtk::Inhibit(true)
});
self.eventbox.connect_button_press_event(move |_, _| {
let mut state = state.borrow_mut();
if let Some(ref data) = state.pending.take() {
println!("{:?}", data);
Self::set_content(&c, Some(&data.name));
};
gtk::Inhibit(true)
});
}
}
@@ -164,7 +147,7 @@ impl Cell {
fn new(position: CellPosition) -> Self {
Cell {
inner: CellWidget::new(position, ""),
position
position,
}
}
}