From 32ffe82815f519bd67107367249b7433521c35de Mon Sep 17 00:00:00 2001 From: Artus Date: Sat, 8 Jun 2019 15:49:13 +0200 Subject: [PATCH] removes initial pawns, adds utf-8 support --- src/grid.rs | 10 +++++++--- src/main.rs | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/grid.rs b/src/grid.rs index d7d3cb9..5a2b73d 100644 --- a/src/grid.rs +++ b/src/grid.rs @@ -74,7 +74,7 @@ impl CellWidget { name: builder.get_object("name").unwrap(), desc_btn: builder.get_object("desc_btn").unwrap(), targets: vec![ - gtk::TargetEntry::new("text/plain", gtk::TargetFlags::SAME_APP, 0), + gtk::TargetEntry::new("text/plain;charset=utf-8", gtk::TargetFlags::SAME_APP, 0), ], }; cell.desc_btn.set_visible(false); @@ -102,9 +102,13 @@ impl CellWidget { println!("Send..."); // TODO: Refactoring, this is the inverse of 'placing', // building a PawnData instead of destructuring it. - if let Some(to_send) = c.name.get_text() { + if let Some(to_send) = c.name + .get_text() + { + dbg!(&to_send); data.set_text(&to_send); - } else { + } + else { dbg!("Should not happen !!"); } }); diff --git a/src/main.rs b/src/main.rs index 791e41e..cb51be5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -157,9 +157,6 @@ impl App { let pawn_list = pawn::PawnList::init(pawn_list); app_state.borrow_mut().pawns.replace(pawn_list); - for pawn in pawn::pawn_factory() { - app_state.add_pawn(&pawn); - } win.show_all(); // Before grid because we want to hide some widgets there // Initialize grid let grid: gtk::Grid = builder.get_object("map").unwrap();