alihan/textual
1
0
Fork 0
mirror of https://github.com/Textualize/textual.git synced 2025-10-17 02:38:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issues with start and end of bar

Browse Source
This commit is contained in:
Darren Burns
2022-01-28 16:55:09 +00:00
parent b6d7e93542
commit 9e10f38d6b
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/textual/renderables/tab_underline.py
View File

@@ -30,28 +30,19 @@ class UnderlineBar:
half_bar_right = "╸" half_bar_right = "╸"
half_bar_left = "╺" half_bar_left = "╺"
bar = "━" bar = "━"
width = self.width or options.max_width width = (self.width or options.max_width) - 1
start, end = self.highlight_range start, end = self.highlight_range
# Round start and end to nearest half # Round start and end to nearest half
start = round(start * 2) / 2 start = round(start * 2) / 2
end = round(end * 2) / 2 end = round(end * 2) / 2
# start = 3.6; end = 9.6
# full bars before = int(start) = 3
# half_start = .6 > 0 = True
# Bars before highlighted range
half_start = start - int(start) > 0 half_start = start - int(start) > 0
half_end = end - int(end) > 0 half_end = end - int(end) > 0
# Non-highlighted portion of bar # Initial non-highlighted portion of bar
yield Segment(bar * (int(start - 0.5)), style=self.other_style)
if half_start: if not half_start and start > 0:
yield Segment(bar * (int(start) + 1), style=self.other_style)
yield Segment(half_bar_left, style=self.highlight_style)
else:
yield Segment(bar * (int(start)), style=self.other_style)
yield Segment(half_bar_right, style=self.other_style) yield Segment(half_bar_right, style=self.other_style)
# If we have a half bar at start and end, we need 1 less full bar # If we have a half bar at start and end, we need 1 less full bar
@@ -59,13 +50,18 @@ class UnderlineBar:
if half_start and half_end: if half_start and half_end:
full_bar_width -= 1 full_bar_width -= 1
yield Segment(bar * full_bar_width, style=self.highlight_style) # The highlighted portion
if not half_start:
yield Segment(bar * full_bar_width, style=self.highlight_style)
else:
yield Segment(half_bar_left, style=self.highlight_style)
yield Segment(bar * full_bar_width, style=self.highlight_style)
if half_end: if half_end:
yield Segment(half_bar_right, style=self.highlight_style) yield Segment(half_bar_right, style=self.highlight_style)
else:
yield Segment(half_bar_left, style=self.other_style)
# The non-highlighted tail
if not half_end and end - width != 1:
yield Segment(half_bar_left, style=self.other_style)
yield Segment(bar * (int(width) - int(end)), style=self.other_style) yield Segment(bar * (int(width) - int(end)), style=self.other_style)