Update dependencies

pop-os · Jun 12, 2024 · 7c02b9c · 7c02b9c
1 parent 8bd54b9
commit 7c02b9c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/terminal.rs b/src/terminal.rs
@@ -378,7 +378,7 @@ impl Terminal {
 
             self.with_buffer_mut(|buffer| {
                 let mut font_system = font_system().write().unwrap();
-                buffer.set_size(font_system.raw(), width as f32, height as f32);
+                buffer.set_size(font_system.raw(), Some(width as f32), Some(height as f32));
             });
 
             self.needs_update = true;

diff --git a/src/terminal_box.rs b/src/terminal_box.rs
@@ -217,7 +217,11 @@ where
 
             let x = p.x - self.padding.left;
             let y = p.y - self.padding.top;
-            if x >= 0.0 && x < buffer_size.0 && y >= 0.0 && y < buffer_size.1 {
+            if x >= 0.0
+                && x < buffer_size.0.unwrap_or(0.0)
+                && y >= 0.0
+                && y < buffer_size.1.unwrap_or(0.0)
+            {
                 return mouse::Interaction::Text;
             }
         }
@@ -836,7 +840,11 @@ where
                         if let Button::Left = button {
                             let x = p.x - self.padding.left;
                             let y = p.y - self.padding.top;
-                            if x >= 0.0 && x < buffer_size.0 && y >= 0.0 && y < buffer_size.1 {
+                            if x >= 0.0
+                                && x < buffer_size.0.unwrap_or(0.0)
+                                && y >= 0.0
+                                && y < buffer_size.1.unwrap_or(0.0)
+                            {
                                 let click_kind =
                                     if let Some((click_kind, click_time)) = state.click.take() {
                                         if click_time.elapsed() < self.click_timing {
@@ -889,8 +897,8 @@ where
                                 && x < (scrollbar_rect.x + scrollbar_rect.width)
                             {
                                 if terminal.scrollbar().is_some() {
-                                    let scroll_ratio =
-                                        terminal.with_buffer(|buffer| y / buffer.size().1);
+                                    let scroll_ratio = terminal
+                                        .with_buffer(|buffer| y / buffer.size().1.unwrap_or(1.0));
                                     terminal.scroll_to(scroll_ratio);
                                     if let Some(start_scroll) = terminal.scrollbar() {
                                         state.dragging = Some(Dragging::Scrollbar {
@@ -995,8 +1003,9 @@ where
                                     start_y,
                                     start_scroll,
                                 } => {
-                                    let scroll_offset = terminal
-                                        .with_buffer(|buffer| ((y - start_y) / buffer.size().1));
+                                    let scroll_offset = terminal.with_buffer(|buffer| {
+                                        (y - start_y) / buffer.size().1.unwrap_or(1.0)
+                                    });
                                     terminal.scroll_to(start_scroll.0 + scroll_offset);
                                 }
                             }