`32adda5`

fix last line cursor visual mismatch

Authored by

espadonne 4 months ago

Status	File	+	-
M	`src/editor/state.rs`	6	5
M	`src/render/screen.rs`	11	1
M	`src/workspace/state.rs`	3	2

src/editor/state.rsmodified

          } else {
          };
 -        let top_offset = if self.workspace.tabs.len() > 1 { 1 } else { 0 };
 +        // Tab bar is always rendered (takes 1 row)
 +        let top_offset = 1;
          // Calculate line number column width (same as in screen.rs)
          let line_num_width = {
+             }
              Mouse::ScrollDown { .. } => {
                  // Scroll down 3 lines
 -                // Calculate visible rows (accounting for tab bar, gap, and status bar)
 -                let top_offset = if self.workspace.tabs.len() > 1 { 1 } else { 0 };
 +                // Calculate visible rows (tab bar always rendered, plus gap and status bar)
 +                let top_offset = 1;
                  let visible_rows = (self.screen.rows as usize).saturating_sub(2 + top_offset);
                  // Max viewport is when the last line is at the bottom of visible area
                  let max_viewport = self.buffer().line_count().saturating_sub(visible_rows).max(0);
      // === Viewport ===
      fn scroll_to_cursor(&mut self) {
 -        // Calculate top offset (tab bar takes 1 row if multiple tabs)
 -        let top_offset = if self.workspace.tabs.len() > 1 { 1 } else { 0 };
 +        // Tab bar is always rendered (takes 1 row)
 +        let top_offset = 1;
          // Vertical scrolling (2 rows reserved: gap + status bar, plus top_offset for tab bar)
          let visible_rows = (self.screen.rows as usize).saturating_sub(2 + top_offset);

src/render/screen.rsmodified

          // Calculate available screen area
          let available_width = self.cols.saturating_sub(left_offset) as f32;
 -        let available_height = self.rows.saturating_sub(1 + top_offset) as f32; // -1 for status bar
 +        let available_height = self.rows.saturating_sub(2 + top_offset) as f32; // -2 for gap + status bar
          // Track where to place the hardware cursor (active pane's primary cursor)
          let mut cursor_screen_pos: Option<(u16, u16)> = None;
+             }
+         }
 +        // Render the gap row (empty line between text and status bar)
 +        let gap_row = top_offset + available_height as u16;
 +        execute!(
 +            self.stdout,
 +            MoveTo(left_offset, gap_row),
 +            SetBackgroundColor(BG_COLOR),
 +            Clear(ClearType::UntilNewLine),
 +            ResetColor
 +        )?;
++
          // Render status bar (use active pane's info)
          if let Some(active_pane) = panes.iter().find(|p| p.is_active) {
              self.render_status_bar_with_offset(

src/workspace/state.rsmodified

      pub fn pane_at_screen_position(&self, col: u16, row: u16, screen_cols: u16, screen_rows: u16, left_offset: u16, top_offset: u16) -> usize {
          // Available space for panes (excluding fuss width and tab bar)
          let available_width = screen_cols.saturating_sub(left_offset) as f32;
 -        let available_height = screen_rows.saturating_sub(1 + top_offset) as f32; // -1 for status bar
 +        let available_height = screen_rows.saturating_sub(2 + top_offset) as f32; // -2 for gap + status bar
          // Adjust click coordinates for offsets
          let adj_col = col.saturating_sub(left_offset) as f32;
          } else {
          };
 -        let top_offset = if self.tabs.len() > 1 { 1u16 } else { 0 };
 +        // Tab bar is always rendered (takes 1 row)
 +        let top_offset = 1u16;
          self.tabs[self.active_tab].pane_at_screen_position(
              col, row, screen_cols, screen_rows, fuss_width, top_offset