bilbo/xm_player
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support 3-digit note indicies; reposition channel status

Browse Source
This commit is contained in:
Zack Buhman 2025-07-04 18:19:12 -05:00
parent 5596b3e646
commit 606616d1f5
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/scene/tracker/channel_status.cpp
View File

@ -80,9 +80,14 @@ void draw(ta_multiwriter& multi, int x, int y)
int hori_center = inner_width / 2 - (glyph::hori_advance * ((ch + 1) >= 10)) / 2; int hori_center = inner_width / 2 - (glyph::hori_advance * ((ch + 1) >= 10)) / 2;
transfer_integer(multi.pt, ch + 1, transfer_integer(multi.pt, ch + 1,
xi + hori_center, y + vert_center, 0.1f, xi + hori_center, y + vert_center + 1, 0.1f,
0, 0, 0, 0,
0xa7a7a7); 0xa7a7a7);
transfer_integer(multi.pt, ch + 1,
xi + hori_center + 1, y + vert_center + 2, 0.09f,
0, 0,
0x000000);
} }
xi += width_per_col; xi += width_per_col;

2
src/scene/tracker/channel_status.hpp
View File

@ -3,7 +3,7 @@
#include "ta_multiwriter.hpp" #include "ta_multiwriter.hpp"
namespace scene::tracker::channel_status { namespace scene::tracker::channel_status {
const int height = 50; const int height = 45;
void draw(ta_multiwriter& multi, int x, int y); void draw(ta_multiwriter& multi, int x, int y);
} }

4
src/scene/tracker/notes.cpp
View File

@ -58,7 +58,7 @@ static inline int draw_line_index(ta_parameter_writer& writer, int line_index, i
int base_color = ((line_index % 4) == 0) ? dark : light; int base_color = ((line_index % 4) == 0) ? dark : light;
int len = transfer_integer(writer, line_index, x, y, depth, 2, ' ', base_color); int len = transfer_integer(writer, line_index, x, y, depth, 3, ' ', base_color);
x += glyph::hori_advance * len; x += glyph::hori_advance * len;
return x; return x;
@ -237,7 +237,7 @@ void draw_borders(ta_parameter_writer& writer, int x, int y)
using namespace interpreter; using namespace interpreter;
//transfer_vertical_border(writer, x, y, line_column_height); //transfer_vertical_border(writer, x, y, line_column_height);
x += 3 + glyph::hori_advance * 2 + 2; x += 3 + glyph::hori_advance * 3 + 2;
for (int ch = 0; ch < (state.xm.number_of_channels); ch++) { for (int ch = 0; ch < (state.xm.number_of_channels); ch++) {
transfer_vertical_border(writer, x, y, line_column_height); transfer_vertical_border(writer, x, y, line_column_height);

2
src/scene/tracker/scene.cpp
View File

@ -304,7 +304,7 @@ namespace scene::tracker {
draw_button_labels(multi.pt); draw_button_labels(multi.pt);
tracklist::draw(multi, top.width + 5, 5); tracklist::draw(multi, top.width + 5, 5);
float y = top.y() + top.height + 5; float y = top.y() + top.height + 5;
channel_status::draw(multi, 5, y); channel_status::draw(multi, 5, y + 3);
cover::draw(multi, cover_x, cover_y, cover_zoom); cover::draw(multi, cover_x, cover_y, cover_zoom);
y += channel_status::height + 10; y += channel_status::height + 10;
notes::draw(multi, 5, y); notes::draw(multi, 5, y);