adam/contact
1
0
Fork 0
mirror of https://github.com/pdxlocations/contact.git synced 2026-06-27 13:32:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

clean-up

Browse Source
This commit is contained in:
pdxlocations
2025-05-18 12:17:27 -07:00
parent 33f7db4cb9
commit 74d19c5ca7
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contact/ui/contact_ui.py
+3 -10
View File
@@ -13,7 +13,6 @@ from contact.utilities.input_handlers import get_list_input
import contact.ui.default_config as config
import contact.ui.dialog
from contact.ui.nav_utils import move_main_highlight, draw_main_arrows, get_msg_window_lines
from contact.utilities.singleton import ui_state, interface_state
@@ -185,7 +184,6 @@ def main_ui(stdscr: curses.window) -> None:
channel_win.attrset(get_color("window_frame"))
channel_win.box()
channel_win.refresh()
# highlight_line(False, 0, ui_state.selected_channel)
refresh_pad(0)
if old_window == 1:
messages_win.attrset(get_color("window_frame"))
@@ -197,7 +195,6 @@ def main_ui(stdscr: curses.window) -> None:
nodes_win.attrset(get_color("window_frame"))
nodes_win.box()
nodes_win.refresh()
# highlight_line(False, 2, ui_state.selected_node)
refresh_pad(2)
if ui_state.current_window == 0:
@@ -205,7 +202,6 @@ def main_ui(stdscr: curses.window) -> None:
channel_win.box()
channel_win.attrset(get_color("window_frame"))
channel_win.refresh()
# highlight_line(True, 0, ui_state.selected_channel)
refresh_pad(0)
elif ui_state.current_window == 1:
messages_win.attrset(get_color("window_frame_selected"))
@@ -219,7 +215,6 @@ def main_ui(stdscr: curses.window) -> None:
nodes_win.box()
nodes_win.attrset(get_color("window_frame"))
nodes_win.refresh()
# highlight_line(True, 2, ui_state.selected_node)
refresh_pad(2)
# Check for Esc
@@ -464,7 +459,7 @@ def draw_channel_list() -> None:
channel_win.box()
channel_win.attrset((get_color("window_frame")))
draw_main_arrows(channel_win, len(ui_state.channel_list), ui_state.start_index, ui_state.current_window)
draw_main_arrows(channel_win, len(ui_state.channel_list), window=0)
channel_win.refresh()
refresh_pad(0)
@@ -518,8 +513,7 @@ def draw_messages_window(scroll_to_bottom: bool = False) -> None:
draw_main_arrows(
messages_win,
msg_line_count,
ui_state.start_index,
1,
window=1,
log_height=packetlog_win.getmaxyx()[0],
)
messages_win.refresh()
@@ -566,7 +560,7 @@ def draw_node_list() -> None:
nodes_win.box()
nodes_win.attrset(get_color("window_frame"))
draw_main_arrows(nodes_win, len(ui_state.node_list), ui_state.start_index, ui_state.current_window)
draw_main_arrows(nodes_win, len(ui_state.node_list), window=2)
nodes_win.refresh()
refresh_pad(2)
@@ -633,7 +627,6 @@ def scroll_messages(direction: int) -> None:
draw_main_arrows(
messages_win,
msg_line_count,
ui_state.start_index,
ui_state.current_window,
log_height=packetlog_win.getmaxyx()[0],
)
contact/ui/nav_utils.py
+5 -6
View File
@@ -140,7 +140,6 @@ def draw_arrows(
win: object, visible_height: int, max_index: int, start_index: List[int], show_save_option: bool
) -> None:
# vh = visible_height + (1 if show_save_option else 0)
mi = max_index - (2 if show_save_option else 0)
if visible_height < mi:
@@ -355,7 +354,7 @@ def move_main_highlight(
if ui_state.current_window == 0: # hack to fix max_index
max_index += 1
draw_main_arrows(menu_win, max_index, ui_state.start_index, ui_state.current_window)
draw_main_arrows(menu_win, max_index, window=ui_state.current_window)
menu_win.refresh()
@@ -388,23 +387,23 @@ def highlight_line(
)
def draw_main_arrows(win: object, max_index: int, start_index: List[int], current_window: int, **kwargs) -> None:
def draw_main_arrows(win: object, max_index: int, window: int, **kwargs) -> None:
height, width = win.getmaxyx()
usable_height = height - 2
usable_width = width - 2
if current_window == 1 and ui_state.display_log:
if window == 1 and ui_state.display_log:
if log_height := kwargs.get("log_height"):
usable_height -= log_height - 1
if usable_height < max_index:
if start_index[current_window] > 0:
if ui_state.start_index[window] > 0:
win.addstr(1, usable_width, "▲", get_color("settings_default"))
else:
win.addstr(1, usable_width, " ", get_color("settings_default"))
if max_index - start_index[current_window] - 1 >= usable_height:
if max_index - ui_state.start_index[window] - 1 >= usable_height:
win.addstr(usable_height, usable_width, "▼", get_color("settings_default"))
else:
win.addstr(usable_height, usable_width, " ", get_color("settings_default"))