diff options
Diffstat (limited to 'src/drawing.c')
-rw-r--r-- | src/drawing.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/drawing.c b/src/drawing.c index fbc741c..27e265b 100644 --- a/src/drawing.c +++ b/src/drawing.c | |||
@@ -418,7 +418,12 @@ draw_bpm() { | |||
418 | txt_drawf("SYNC", x + 2, y + 2, COL_FG); | 418 | txt_drawf("SYNC", x + 2, y + 2, COL_FG); |
419 | } else { | 419 | } else { |
420 | // Make sure its horizontally centered if only 2 digits | 420 | // Make sure its horizontally centered if only 2 digits |
421 | int bpm = patterns[pattern_selection_loc].bpm; | 421 | int bpm; |
422 | if (settings.global_bpm) { | ||
423 | bpm = settings.bpm; | ||
424 | } else { | ||
425 | bpm = patterns[pattern_selection_loc].bpm; | ||
426 | } | ||
422 | if (bpm >= 100) { | 427 | if (bpm >= 100) { |
423 | txt_drawf("%d", x + 5, y + 2, COL_FG, bpm); | 428 | txt_drawf("%d", x + 5, y + 2, COL_FG, bpm); |
424 | } else { | 429 | } else { |
@@ -1672,7 +1677,7 @@ draw_notif_bar() { | |||
1672 | return; | 1677 | return; |
1673 | } | 1678 | } |
1674 | 1679 | ||
1675 | if (settings.help == HELP_ON) { | 1680 | if (settings.help == TOGGLE_ON) { |
1676 | if (input_handler == handle_trigger_selection || | 1681 | if (input_handler == handle_trigger_selection || |
1677 | input_handler == handle_channel_selection) { | 1682 | input_handler == handle_channel_selection) { |
1678 | txt_drawf_small("L/R:NOTE A:PARAMS B:TOGGLE", x0 + 2, y0 + 1, color); | 1683 | txt_drawf_small("L/R:NOTE A:PARAMS B:TOGGLE", x0 + 2, y0 + 1, color); |
@@ -1735,7 +1740,13 @@ draw_notif_bar() { | |||
1735 | roots[current_scale_root], scale_long[current_scale]); | 1740 | roots[current_scale_root], scale_long[current_scale]); |
1736 | } break; | 1741 | } break; |
1737 | case R_COL_BPM: { | 1742 | case R_COL_BPM: { |
1738 | txt_drawf_small("TEMPO: %d bpm", x0 + 2, y0 + 1, color, patterns[pattern_selection_loc].bpm); | 1743 | int bpm; |
1744 | if (settings.global_bpm) { | ||
1745 | bpm = settings.bpm; | ||
1746 | } else { | ||
1747 | bpm = patterns[pattern_selection_loc].bpm; | ||
1748 | } | ||
1749 | txt_drawf_small("TEMPO: %d bpm", x0 + 2, y0 + 1, color, bpm); | ||
1739 | } break; | 1750 | } break; |
1740 | } | 1751 | } |
1741 | return; | 1752 | return; |