From 39e122b668de7923efb786923475c7fd5f21fd07 Mon Sep 17 00:00:00 2001 From: oskarrough Date: Sat, 25 Oct 2025 22:15:16 +0200 Subject: [PATCH] avoid renaming fields Change-Id: lmuuwlrqqsrytzlrxzqklqnyumzwqvon --- src/main.rs | 36 +++++++++++++++++------------------- src/palette.rs | 12 ++++++------ src/panel.rs | 9 --------- 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2056423..4f41169 100644 --- a/src/main.rs +++ b/src/main.rs @@ -249,23 +249,6 @@ fn update(state: &mut State, message: Message) { } PaneMessage::Dragged(_drag_event) => {} PaneMessage::Clicked(_pane) => {} - PaneMessage::Split(axis, pane) => { - if state - .panes - .split(axis, pane, PaneContent::new(None)) - .is_none() - { - eprintln!("Failed to split pane"); - } - } - PaneMessage::Close(pane) => { - if state.panes.close(pane).is_none() { - eprintln!("Failed to close pane"); - } - } - PaneMessage::Maximize(pane) => { - state.panes.maximize(pane); - } }, } } @@ -659,9 +642,24 @@ fn render_tracks_view<'a>( .iter() .fold(column![].spacing(0), |col, (index, track)| { let is_selected = state.selected_tracks.contains(index); - let track_info = format!("{} - {} [{}]", track.slug, track.title, track.source); - let item = container(text(track_info).size(14)) + let slug_part = text(format!("@{}", track.slug)) + .size(13) + .color(palette.red); + + let title_part = text(format!(" {}", track.title)) + .size(13); + + let track_content = if track.description.is_empty() { + row![slug_part, title_part].spacing(0) + } else { + let desc_part = text(format!(" {}", track.description)) + .size(13) + .color(palette.text_dim); + row![slug_part, title_part, desc_part].spacing(0) + }; + + let item = container(track_content) .padding(8) .width(Length::Fill) .style(move |_theme: &Theme| { diff --git a/src/palette.rs b/src/palette.rs index 6d531b2..f3f3df4 100644 --- a/src/palette.rs +++ b/src/palette.rs @@ -3,10 +3,10 @@ use iced::Color; pub struct Palette { pub text: Color, pub text_dim: Color, - pub accent: Color, + pub _accent: Color, pub red: Color, - pub yellow: Color, - pub purple: Color, + pub _yellow: Color, + pub _purple: Color, pub gray1: Color, pub gray2: Color, pub gray3: Color, @@ -19,10 +19,10 @@ impl Default for Palette { Self { text: rgb(27, 24, 27), text_dim: rgb(119, 106, 119), - accent: rgb(81, 105, 235), + _accent: rgb(81, 105, 235), red: rgb(163, 65, 51), - yellow: rgb(187, 138, 52), - purple: rgb(108, 86, 149), + _yellow: rgb(187, 138, 52), + _purple: rgb(108, 86, 149), gray1: rgb(173, 157, 173), gray2: rgb(198, 184, 198), gray3: rgb(204, 189, 204), diff --git a/src/panel.rs b/src/panel.rs index 9ad3def..af91e78 100644 --- a/src/panel.rs +++ b/src/panel.rs @@ -11,9 +11,6 @@ pub enum PaneMessage { Resized(pane_grid::ResizeEvent), Dragged(pane_grid::DragEvent), Clicked(pane_grid::Pane), - Split(pane_grid::Axis, pane_grid::Pane), - Close(pane_grid::Pane), - Maximize(pane_grid::Pane), } impl PaneContent { @@ -44,12 +41,6 @@ impl PaneContent { } } - pub fn set_active_view(&mut self, index: usize) { - if index < self.view_stack.len() { - self.active_view = index; - } - } - pub fn remove_view(&mut self, index: usize) { if index < self.view_stack.len() { self.view_stack.remove(index); -- 2.43.0