Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handling Empty Narrows #1543

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Handling Empty Narrows #1543

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4992dbe
boxes: On opening application, display an empty recipient bar.
Niloth-p Aug 2, 2024
936cf2f
core: Track if the current narrow is empty.
Niloth-p Aug 2, 2024
6cac57d
messages/views: Disable keypresses from dummy messages.
Niloth-p Aug 2, 2024
f8503f8
messages: Customize recipient bar text for dummy messages.
Niloth-p Aug 2, 2024
dcb213a
messages: Turn off recipient header for dummy messages.
Niloth-p Aug 2, 2024
0fb5bf0
model: Replace the dummy message on receiving a new message.
Niloth-p Aug 2, 2024
df2feb4
messages: Remove error handling for unreachable case.
Niloth-p Aug 3, 2024
299a1c1
refactor: messages: Allow datetime field of current message to be empty.
Niloth-p Aug 3, 2024
3444552
utils/messages: Add a dummy message for empty narrows.
Niloth-p Aug 3, 2024
2a66297
core/boxes: Flash footer message on search misses, without narrowing.
Niloth-p Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion zulipterminal/ui_tools/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,23 @@ def private_header(self) -> Any:
header.markup = title_markup
return header

def empty_narrow_header(self) -> Any:
title_markup = ("header", [("general_narrow", "No selected message")])
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if it would be clearer to simply leave this blank?

title = urwid.Text(title_markup)
header = urwid.Columns(
[
("pack", title),
(1, urwid.Text(("general_bar", " "))),
urwid.AttrWrap(urwid.Divider(MESSAGE_HEADER_DIVIDER), "general_bar"),
]
)
header.markup = title_markup
return header

def recipient_header(self) -> Any:
if self.message["type"] == "stream":
if self.model.controller.is_in_empty_narrow:
return self.empty_narrow_header()
elif self.message["type"] == "stream":
Comment on lines -202 to +218
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a partial fix towards the issue? That is, we start to show a different message in the message header and the current-message header? Assuming so, the commit text could indicate that.

Does the new header structure need to follow the form of the others? I know it's rather hacky in places, so it's likely fine for now.

return self.stream_header()
else:
return self.private_header()
Expand Down