From 621c35d7c4b2b01d0c5f57459d2af86c345092af Mon Sep 17 00:00:00 2001
From: Jeremy Wall <Jeremy@marzhillstudios.com>
Date: Thu, 27 Feb 2025 18:45:42 -0500
Subject: [PATCH] wip: different keybinds for bold and italic

---
 examples/test.xlsx | Bin 3961 -> 4066 bytes
 src/ui/mod.rs      |   4 ++--
 src/ui/test.rs     |   8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/test.xlsx b/examples/test.xlsx
index f0a336f1006b5a6ca36819627d9375dada3e2cfb..3276b32b66473c6e9751a3a742706de2ef5095d6 100644
GIT binary patch
delta 1897
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

delta 1767
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
OpS+P@n@yAl!~+1(?e{<c

diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index 1b4cd9a..6e872b3 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -669,12 +669,12 @@ impl<'ws> Workspace<'ws> {
                     self.state.reset_n_prefix();
                     self.state.char_queue.clear();
                 }
-                KeyCode::Char('b') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                KeyCode::Char('B') => {
                     let address = self.book.location.clone();
                     let style = self.book.get_cell_style(self.book.current_sheet, &address).map(|s| s.font.b);
                     self.toggle_bool_style(style, "font.b", &address)?;
                 }
-                KeyCode::Char('i') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                KeyCode::Char('I') => {
                     let address = self.book.location.clone();
                     let style = self.book.get_cell_style(self.book.current_sheet, &address).map(|s| s.font.i);
                     self.toggle_bool_style(style, "font.i", &address)?;
diff --git a/src/ui/test.rs b/src/ui/test.rs
index f9568e7..64a7c9a 100644
--- a/src/ui/test.rs
+++ b/src/ui/test.rs
@@ -1291,7 +1291,7 @@ fn test_bold_text() {
         .expect("Failed to get style");
     assert!(!before_style.font.b);
     script()
-        .ctrl('b')
+        .char('B')
         .run(&mut ws)
         .expect("Unable to run script");
     let style = ws
@@ -1300,7 +1300,7 @@ fn test_bold_text() {
         .expect("Failed to get style");
     assert!(style.font.b);
     script()
-        .ctrl('b')
+        .char('B')
         .run(&mut ws)
         .expect("Unable to run script");
     assert!(!before_style.font.b);
@@ -1315,7 +1315,7 @@ fn test_italic_text() {
         .expect("Failed to get style");
     assert!(!before_style.font.i);
     script()
-        .ctrl('i')
+        .char('I')
         .run(&mut ws)
         .expect("Unable to run script");
     let style = ws
@@ -1324,7 +1324,7 @@ fn test_italic_text() {
         .expect("Failed to get style");
     assert!(style.font.i);
     script()
-        .ctrl('i')
+        .char('I')
         .run(&mut ws)
         .expect("Unable to run script");
     assert!(!before_style.font.i);