From f213a918a5884135bfbf503e6f66f8f705d2fb8f Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 18 Mar 2018 11:06:24 +0100 Subject: [PATCH] Make the side-by-side equal inputs. --- carousel.js | 2 +- nageru/ultimate.lua | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/carousel.js b/carousel.js index 3147c54..35b0288 100644 --- a/carousel.js +++ b/carousel.js @@ -469,7 +469,7 @@ function clear_carousel(table) }; // Stream schedule -let max_list_len = 8; +let max_list_len = 7; function display_stream_schedule(response, group_name) { let teams = parse_teams_from_spreadsheet(response); diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua index bafd818..ad29d6d 100644 --- a/nageru/ultimate.lua +++ b/nageru/ultimate.lua @@ -874,10 +874,9 @@ function prepare_sbs_chain(chain, t, transition_type, src_signal, dst_signal, sc set_neutral_color(chain.input0.wb_effect, neutral_colors[1]) set_neutral_color(chain.input1.wb_effect, neutral_colors[5]) - -- First input is positioned (16,48) from top-left. - -- Second input is positioned (16,48) from the bottom-right. - local pos0 = pos_from_top_left(16, 48, 848, 477, screen_width, screen_height) - local pos1 = pos_from_top_left(1280 - 384 - 16, 720 - 216 - 48, 384, 216, screen_width, screen_height) + -- Both inputs are the same size (true side-by-side). + local pos0 = pos_from_top_left(1280 - 616 - 16, 186, 616, 347, screen_width, screen_height) + local pos1 = pos_from_top_left(16, 186, 616, 347, screen_width, screen_height) local pos_fs = { x0 = 0, y0 = 0, x1 = screen_width, y1 = screen_height } local affine_param -- 2.39.2