Fix a regression in the previous release that broke strikethrough

This commit is contained in:
Kovid Goyal
2022-02-04 13:37:38 +05:30
parent 4776a9e785
commit 37d8483728
2 changed files with 4 additions and 2 deletions

View File

@@ -91,6 +91,8 @@ Detailed list of changes
- macOS: Add the default shortcut :kbd:`cmd+k` to clear the terminal screen and - macOS: Add the default shortcut :kbd:`cmd+k` to clear the terminal screen and
scrollback up to the cursor (:iss:`4625`) scrollback up to the cursor (:iss:`4625`)
- Fix a regression in the previous release that broke strikethrough (:disc:`4632`)
0.24.2 [2022-02-03] 0.24.2 [2022-02-03]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View File

@@ -79,7 +79,7 @@ const uint COLOR_MASK = uint(0x4000);
const uint ZERO = uint(0); const uint ZERO = uint(0);
const uint ONE = uint(1); const uint ONE = uint(1);
const uint TWO = uint(2); const uint TWO = uint(2);
const uint FOUR = uint(4); const uint SIX = uint(6);
const uint SEVEN = uint(7); const uint SEVEN = uint(7);
vec3 color_to_vec(uint c) { vec3 color_to_vec(uint c) {
@@ -194,7 +194,7 @@ void main() {
decoration_fg = choose_color(float(is_selected & ONE), selection_color, decoration_fg); decoration_fg = choose_color(float(is_selected & ONE), selection_color, decoration_fg);
// Underline and strike through (rendered via sprites) // Underline and strike through (rendered via sprites)
underline_pos = choose_color(in_url, to_sprite_pos(pos, url_style, ZERO, ZERO), to_sprite_pos(pos, (text_attrs >> DECORATION_SHIFT) & SEVEN, ZERO, ZERO)); underline_pos = choose_color(in_url, to_sprite_pos(pos, url_style, ZERO, ZERO), to_sprite_pos(pos, (text_attrs >> DECORATION_SHIFT) & SEVEN, ZERO, ZERO));
strike_pos = to_sprite_pos(pos, ((text_attrs >> STRIKE_SHIFT) & ONE) * FOUR, ZERO, ZERO); strike_pos = to_sprite_pos(pos, ((text_attrs >> STRIKE_SHIFT) & ONE) * SIX, ZERO, ZERO);
// Cursor // Cursor
cursor_color_vec = vec4(color_to_vec(cursor_bg), 1.0); cursor_color_vec = vec4(color_to_vec(cursor_bg), 1.0);