BuboBubo/Cagire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fixes
All checks were successful
Deploy Website / deploy (push) Has been skipped
Details

Browse Source
This commit is contained in:
Raphaël Forment
2026-03-01 03:33:22 +01:00
parent b72c782b2b
commit 11cc925faf
24 changed files with 269 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/help_view.rs
View File

@@ -194,7 +194,7 @@ fn render_content(frame: &mut Frame, app: &App, area: Rect) {
}
}
let cache = app.ui.help_parsed.borrow();
let parsed = cache[app.ui.help_topic].as_ref().unwrap();
let parsed = cache[app.ui.help_topic].as_ref().expect("help topic parsed");
let has_search_bar = app.ui.help_search_active || has_query;
let content_area = if has_search_bar {

6
src/views/main_view.rs
View File

@@ -192,7 +192,7 @@ fn render_viz_area(
VizPanel::Spectrum => render_spectrum(frame, app, *panel_area),
VizPanel::Lissajous => render_lissajous(frame, app, *panel_area),
VizPanel::Preview => {
let user_words = user_words_once.as_ref().unwrap();
let user_words = user_words_once.as_ref().expect("user_words initialized");
let has_prelude = !app.project_state.project.prelude.trim().is_empty();
if has_prelude {
let [script_area, prelude_area] = if is_vertical_layout {
@@ -396,13 +396,13 @@ fn render_tile(
(true, true, _, _, _) => (theme.tile.playing_active_bg, theme.tile.playing_active_fg),
(true, false, _, _, _) => (theme.tile.playing_inactive_bg, theme.tile.playing_inactive_fg),
(false, true, true, true, _) => {
let (r, g, b) = link_color.unwrap().0;
let (r, g, b) = link_color.expect("link_color set in this branch").0;
(Color::Rgb(r, g, b), theme.selection.cursor_fg)
}
(false, true, true, false, _) => (theme.tile.active_selected_bg, theme.selection.cursor_fg),
(false, true, _, _, true) => (theme.tile.active_in_range_bg, theme.selection.cursor_fg),
(false, true, false, true, _) => {
let (r, g, b) = link_color.unwrap().1;
let (r, g, b) = link_color.expect("link_color set in this branch").1;
(Color::Rgb(r, g, b), theme.tile.active_fg)
}
(false, true, false, false, _) => {

10
src/views/patterns_view.rs
View File

@@ -155,8 +155,8 @@ fn render_banks(frame: &mut Frame, app: &App, snapshot: &SequencerSnapshot, area
.bank_selection_range()
.is_some_and(|r| r.contains(&idx));
let has_muted = (0..MAX_PATTERNS).any(|p| app.mute.is_muted(idx, p));
let has_soloed = (0..MAX_PATTERNS).any(|p| app.mute.is_soloed(idx, p));
let has_muted = (0..MAX_PATTERNS).any(|p| app.playback.is_muted(idx, p));
let has_soloed = (0..MAX_PATTERNS).any(|p| app.playback.is_soloed(idx, p));
let has_staged_mute = (0..MAX_PATTERNS).any(|p| app.playback.has_staged_mute(idx, p));
let has_staged_solo = (0..MAX_PATTERNS).any(|p| app.playback.has_staged_solo(idx, p));
let has_staged_mute_solo = has_staged_mute || has_staged_solo;
@@ -353,14 +353,14 @@ fn render_patterns(frame: &mut Frame, app: &App, snapshot: &SequencerSnapshot, a
.pattern_selection_range()
.is_some_and(|r| r.contains(&idx));
let is_muted = app.mute.is_muted(bank, idx);
let is_soloed = app.mute.is_soloed(bank, idx);
let is_muted = app.playback.is_muted(bank, idx);
let is_soloed = app.playback.is_soloed(bank, idx);
let has_staged_mute = app.playback.has_staged_mute(bank, idx);
let has_staged_solo = app.playback.has_staged_solo(bank, idx);
let has_staged_props = app.playback.has_staged_props(bank, idx);
let preview_muted = is_muted ^ has_staged_mute;
let preview_soloed = is_soloed ^ has_staged_solo;
let is_effectively_muted = app.mute.is_effectively_muted(bank, idx);
let is_effectively_muted = app.playback.is_effectively_muted(bank, idx);
let (bg, fg, prefix) = if is_cursor {
(theme.selection.cursor, theme.selection.cursor_fg, "")