n
/
git-time-machine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Move commit message to second line of status bar

This commit is contained in:
n loewen (aider) 2025-06-08 09:18:04 +01:00
parent c33866f12d
commit 35207ba7ab
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtm
View File

@ -922,40 +922,39 @@ def draw_commit_details(stdscr, state: AppState, layout: StatusBarLayout):
if not state.commit_hash or layout.total_height < 2: if not state.commit_hash or layout.total_height < 2:
return return
commit_info = f" {state.commit_hash} "
author_branch_info = f" {state.commit_author} [{state.commit_branch}] "
available_width = layout.screen_width - len(commit_info) - len(author_branch_info) - 1
# Get the commit message (potentially multi-line) # Get the commit message (potentially multi-line)
message_lines = state.commit_message.splitlines() message_lines = state.commit_message.splitlines()
if not message_lines: if not message_lines:
message_lines = [""] message_lines = [""]
try: try:
# Always draw the commit hash and first line of message on the bottom line # Draw on the second line of the status bar (layout.commit_detail_start_y)
bottom_line = layout.commit_detail_end_y second_line = layout.commit_detail_start_y
# Draw the commit hash with bold # Draw the commit hash with bold at the start
stdscr.addstr(bottom_line, 0, commit_info, curses.A_REVERSE | curses.A_BOLD) commit_info = f" {state.commit_hash} "
stdscr.addstr(second_line, 0, commit_info, curses.A_REVERSE | curses.A_BOLD)
# Draw the author and branch on the right of the bottom line # Draw the author and branch on the right
author_branch_info = f" {state.commit_author} [{state.commit_branch}] "
right_x = layout.screen_width - len(author_branch_info) right_x = layout.screen_width - len(author_branch_info)
if right_x >= 0: if right_x >= 0:
stdscr.addstr(bottom_line, right_x, author_branch_info, curses.A_REVERSE) stdscr.addstr(second_line, right_x, author_branch_info, curses.A_REVERSE)
# Draw the first line of the commit message on the same line as the hash # Draw the first line of the commit message in between
available_width = layout.screen_width - len(commit_info) - len(author_branch_info) - 1
first_line = message_lines[0] if message_lines else "" first_line = message_lines[0] if message_lines else ""
if len(first_line) > available_width: if len(first_line) > available_width:
first_line = first_line[:available_width-3] + "..." first_line = first_line[:available_width-3] + "..."
stdscr.addstr(bottom_line, len(commit_info), first_line, curses.A_REVERSE) stdscr.addstr(second_line, len(commit_info), first_line, curses.A_REVERSE)
# Draw additional lines of the commit message if we have space and more lines # Draw additional lines of the commit message if we have more space
for i, line in enumerate(message_lines[1:], 1): for i, line in enumerate(message_lines[1:], 1):
line_y = layout.commit_detail_end_y - i line_y = layout.commit_detail_start_y + i
if line_y < layout.commit_detail_start_y: if line_y >= layout.start_y + layout.total_height:
break # No more space break # No more space
# For continuation lines, we have more space since we don't need to show the hash # For continuation lines, indent them
line_available_width = layout.screen_width - 4 # Leave some margin line_available_width = layout.screen_width - 4 # Leave some margin
if len(line) > line_available_width: if len(line) > line_available_width:
line = line[:line_available_width-3] + "..." line = line[:line_available_width-3] + "..."