zaphar/sheetsui
1
0
Fork 0
mirror of https://github.com/zaphar/sheetsui.git synced 2025-07-22 13:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

wip: RangeSelection no longer needs original_sheet

Browse Source
This commit is contained in:
Jeremy Wall 2025-02-26 21:57:52 -05:00
parent 5012649210
commit e1c64db0a0
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ui/mod.rs
View File

@ -34,8 +34,6 @@ pub enum Modality {
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct RangeSelection { pub struct RangeSelection {
pub original_location: Option<Address>, pub original_location: Option<Address>,
pub original_sheet: Option<u32>,
pub sheet: Option<u32>,
pub start: Option<Address>, pub start: Option<Address>,
pub end: Option<Address>, pub end: Option<Address>,
} }
@ -62,7 +60,6 @@ impl RangeSelection {
pub fn reset_range_selection(&mut self) { pub fn reset_range_selection(&mut self) {
self.start = None; self.start = None;
self.end = None; self.end = None;
self.sheet = None;
} }
} }
@ -217,12 +214,12 @@ impl<'ws> Workspace<'ws> {
start.to_range_part(), start.to_range_part(),
format!(":{}", end.to_range_part()) format!(":{}", end.to_range_part())
); );
if let Some(range_sheet) = state.range_select.sheet { if let Some(ref start_addr) = state.range_select.start {
if range_sheet != self.book.location.sheet { if start_addr.sheet != self.book.location.sheet {
return format!( return format!(
"{}!{}", "{}!{}",
self.book self.book
.get_sheet_name_by_idx(range_sheet as usize) .get_sheet_name_by_idx(start_addr.sheet as usize)
.expect("No such sheet index"), .expect("No such sheet index"),
a1 a1
); );
@ -566,7 +563,6 @@ impl<'ws> Workspace<'ws> {
ws.book.select_next_sheet(); ws.book.select_next_sheet();
Ok(()) Ok(())
})?; })?;
self.state.range_select.sheet = Some(self.book.location.sheet);
} }
KeyCode::Char('p') if key.modifiers == KeyModifiers::CONTROL => { KeyCode::Char('p') if key.modifiers == KeyModifiers::CONTROL => {
self.state.range_select.reset_range_selection(); self.state.range_select.reset_range_selection();
@ -574,7 +570,6 @@ impl<'ws> Workspace<'ws> {
ws.book.select_prev_sheet(); ws.book.select_prev_sheet();
Ok(()) Ok(())
})?; })?;
self.state.range_select.sheet = Some(self.book.location.sheet);
} }
KeyCode::Char('C') if key.modifiers.contains(KeyModifiers::CONTROL) => { KeyCode::Char('C') if key.modifiers.contains(KeyModifiers::CONTROL) => {
self.copy_range(true)?; self.copy_range(true)?;
@ -893,8 +888,6 @@ impl<'ws> Workspace<'ws> {
} }
fn enter_range_select_mode(&mut self, init_start: bool) { fn enter_range_select_mode(&mut self, init_start: bool) {
self.state.range_select.sheet = Some(self.book.location.sheet);
self.state.range_select.original_sheet = Some(self.book.location.sheet);
self.state.range_select.original_location = Some(self.book.location.clone()); self.state.range_select.original_location = Some(self.book.location.clone());
if init_start { if init_start {
self.state.range_select.start = Some(self.book.location.clone()); self.state.range_select.start = Some(self.book.location.clone());
@ -929,12 +922,6 @@ impl<'ws> Workspace<'ws> {
} }
fn exit_range_select_mode(&mut self) -> Result<()> { fn exit_range_select_mode(&mut self) -> Result<()> {
self.book.location.sheet = self
.state
.range_select
.original_sheet
.clone()
.expect("Missing original sheet");
self.book.location = self self.book.location = self
.state .state
.range_select .range_select

7
src/ui/test.rs
View File

@ -1119,13 +1119,6 @@ macro_rules! assert_range_copy {
.as_ref() .as_ref()
.expect("Expected an original location") .expect("Expected an original location")
); );
assert_eq!(
0,
ws.state
.range_select
.original_sheet
.expect("Expected an original sheet")
);
assert_eq!( assert_eq!(
Some(&Modality::RangeSelect), Some(&Modality::RangeSelect),
ws.state.modality_stack.iter().last() ws.state.modality_stack.iter().last()