jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Handle palette in GUI

This commit is contained in:
Jaby 2025-02-17 10:29:40 +01:00
parent 61562a1588
commit 10dab4c2b3
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Tools/tim_tool/src/gui/main_tab.rs
View File

@ -28,31 +28,52 @@ impl MainTab {
pub fn add_new_vram_file(&mut self, file_name: &String, image: slint::Image, image_palette: Option<slint::Image>) { pub fn add_new_vram_file(&mut self, file_name: &String, image: slint::Image, image_palette: Option<slint::Image>) {
let vram_data = self.vram.lock().expect("VRAM already locked"); let vram_data = self.vram.lock().expect("VRAM already locked");
let add_new_image = |file_name: &String, image: slint::Image| { let add_new_image = |file_name: &String, image: slint::Image, palette_count: i32, is_palette: bool| {
let vram_image = VRAMImage{ let vram_image = VRAMImage{
img: image, img: image,
x: 0, x: 0,
y: 0, y: 0,
palette_count: 0, palette_count,
is_palette: false, is_palette,
}; };
vram_data.file_list.push(slint::StandardListViewItem::from(file_name.as_str())); vram_data.file_list.push(slint::StandardListViewItem::from(file_name.as_str()));
vram_data.image_list.push(vram_image); vram_data.image_list.push(vram_image);
}; };
add_new_image(file_name, image);
add_new_image(file_name, image, if image_palette.is_some() {1} else {0}, false);
if let Some(image_palette) = image_palette {
let file_name = file_name.clone() + " (Palette)";
add_new_image(&file_name, image_palette, 0, true);
}
} }
pub fn remove_vram_file(&mut self, idx: usize) -> bool { pub fn remove_vram_file(&mut self, idx: usize) -> bool {
let vram_data = self.vram.lock().expect("VRAM already locked"); let vram_data = self.vram.lock().expect("VRAM already locked");
if let Some(element) = vram_data.image_list.iter().skip(idx).next() { let remove_image = |idx: usize| {
if element.is_palette { vram_data.file_list.remove(idx);
return false; vram_data.image_list.remove(idx);
} };
}
vram_data.file_list.remove(idx); let extras = {
vram_data.image_list.remove(idx); if let Some(element) = vram_data.image_list.iter().skip(idx).next() {
if element.is_palette {
return false;
}
else {
element.palette_count as usize
}
}
else {
0
}
};
for _ in idx..=idx+extras {
remove_image(idx);
}
return true; return true;
} }

2
src/Tools/tim_tool/src/main.rs
View File

@ -58,7 +58,7 @@ fn setup_file_tab(gui_elements_ref: Rc<RefCell<GUIElements>>, logic_ref: Rc<RefC
let file_tab = &gui_elements.file_tab; let file_tab = &gui_elements.file_tab;
let file_name = if let Some(name) = file.file_name() {Some(name.to_string_lossy().to_string())} else {None}; let file_name = if let Some(name) = file.file_name() {Some(name.to_string_lossy().to_string())} else {None};
let (image, palette_image) = logic.borrow_mut().set_unadded_tim(&file)?; let (image, _palette_image) = logic.borrow_mut().set_unadded_tim(&file)?;
let img_size = image.size(); let img_size = image.size();
if img_size.width > VRAM_WIDTH as u32 || img_size.height > VRAM_HEIGHT as u32 { if img_size.width > VRAM_WIDTH as u32 || img_size.height > VRAM_HEIGHT as u32 {