Skip to content

Sulis editor fixes #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 4, 2020
Merged

Sulis editor fixes #173

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4be92d0
fix editor actor_creator crash #172
Mar 1, 2020
8b06b78
An usize of 0 shouldn't be decremented, also prevent the modulo 0.
Mar 3, 2020
df8bad3
Images is already tested and cannot be empty
Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions sulis_editor/src/actor_creator_window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,10 @@ impl ActorCreatorWindow {
.add_callback(Callback::new(Rc::new(move |widget, _| {
let (_, window) = Widget::parent_mut::<ActorCreatorWindow>(widget);

let index = window.selected_images.get(&layer).unwrap().0;
if index > 0 {
let index = index - 1;
window
.selected_images
.insert(layer, (index, Rc::clone(&images_ref[index])));
}
let index = (window.selected_images.get(&layer).unwrap().0 + len - 1) % len;
window
.selected_images
.insert(layer, (index, Rc::clone(&images_ref[index])));
window.build_preview();
})));

Expand All @@ -214,13 +211,10 @@ impl ActorCreatorWindow {
.add_callback(Callback::new(Rc::new(move |widget, _| {
let (_, window) = Widget::parent_mut::<ActorCreatorWindow>(widget);

let index = window.selected_images.get(&layer).unwrap().0;
if index < len - 1 {
let index = index + 1;
window
.selected_images
.insert(layer, (index, Rc::clone(&images_ref[index])));
}
let index = (window.selected_images.get(&layer).unwrap().0 + 1) % len;
window
.selected_images
.insert(layer, (index, Rc::clone(&images_ref[index])));
window.build_preview();
})));

Expand Down