work on browser panel

MeadowlarkDAW · BillyDM · Jan 15, 2023 · Oct 3, 2022 · Oct 4, 2022 · Oct 4, 2022
commit f5bb54d3d7026a6d4d469f6d6850b4e5ace5907b
diff --git a/src/state_system.rs b/src/state_system.rs
@@ -6,6  6,8 @@ pub mod bound_ui_state;
 pub use actions::AppAction;
 pub use bound_ui_state::{BoundUiState, BrowserPanelTab};
 
 use crate::state_system::bound_ui_state::BrowserListEntryType;
 
 #[derive(Lens)]
 pub struct StateSystem {
     pub bound_ui_state: BoundUiState,
@@ -41,6  43,25 @@ impl Model for StateSystem {
             AppAction::SetBrowserVolumeNormalized(volume_normalized) => {
                 self.bound_ui_state.browser_panel_volume_normalized = *volume_normalized;
             }
             AppAction::BrowserItemSelected(index) => {
                 if let Some(old_entry_i) = self.bound_ui_state.selected_browser_entry.take() {
                     if let Some(old_entry) =
                         &mut self.bound_ui_state.browser_list_entries.get_mut(old_entry_i)
                     {
                         old_entry.selected = false;
                     }
                 }
 
                 if let Some(entry) = self.bound_ui_state.browser_list_entries.get_mut(*index) {
                     match entry.type_ {
                         BrowserListEntryType::AudioFile => {
                             self.bound_ui_state.selected_browser_entry = Some(*index);
                             entry.selected = true;
                         }
                         BrowserListEntryType::Folder => {}
                     }
                 }
             }
         });
     }
 }
diff --git a/src/state_system/actions.rs b/src/state_system/actions.rs
@@ -8,4  8,5 @@ pub enum AppAction {
     SetBrowserPanelWidth(f32),
     SetBrowserPanelSearchText(String),
     SetBrowserVolumeNormalized(f32),
     BrowserItemSelected(usize),
 }
diff --git a/src/state_system/bound_ui_state.rs b/src/state_system/bound_ui_state.rs
@@ -1,6  1,6 @@
 use vizia::prelude::*;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Data)]
 pub enum BrowserPanelTab {
     Samples,
     Multisamples,
@@ -12,13  12,29 @@ pub enum BrowserPanelTab {
     Files,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum BrowserListEntryType {
     AudioFile,
     Folder,
 }
 
 #[derive(Debug, Lens, Clone)]
 pub struct BrowserListEntry {
     pub type_: BrowserListEntryType,
     pub text: String,
     pub selected: bool,
 }
 
 #[derive(Debug, Lens, Clone)]
 pub struct BoundUiState {
     pub browser_panel_shown: bool,
     pub browser_panel_tab: BrowserPanelTab,
     pub browser_panel_width: f32,
     pub browser_panel_search_text: String,
     pub browser_panel_volume_normalized: f32,
     pub browser_current_directory: String,
     pub browser_list_entries: Vec<BrowserListEntry>,
     pub selected_browser_entry: Option<usize>,
 }
 
 impl BoundUiState {
@@ -29,6  45,56 @@ impl BoundUiState {
             browser_panel_width: 200.0,
             browser_panel_search_text: String::new(),
             browser_panel_volume_normalized: 0.75,
             browser_current_directory: "../testtesttest".into(),
             selected_browser_entry: None,
 
             browser_list_entries: vec![
                 BrowserListEntry {
                     type_: BrowserListEntryType::Folder,
                     text: "test_folder_1".into(),
                     selected: false,
                 },
                 BrowserListEntry {
                     type_: BrowserListEntryType::Folder,
                     text: "test_folder_2".into(),
                     selected: false,
                 },
                 BrowserListEntry {
                     type_: BrowserListEntryType::Folder,
                     text: "test_folder_3".into(),
                     selected: false,
                 },
                 BrowserListEntry {
                     type_: BrowserListEntryType::AudioFile,
                     text: "test_file_1.wav".into(),
                     selected: false,
                 },
                 BrowserListEntry {
                     type_: BrowserListEntryType::AudioFile,
                     text: "test_file_2.wav".into(),
                     selected: false,
                 },
                 BrowserListEntry {
                     type_: BrowserListEntryType::AudioFile,
                     text: "test_file_3.wav".into(),
                     selected: false,
                 },
                 BrowserListEntry {
                     type_: BrowserListEntryType::AudioFile,
                     text: "test_file_4.wav".into(),
                     selected: false,
                 },
                 BrowserListEntry {
                     type_: BrowserListEntryType::AudioFile,
                     text: "test_file_5.wav".into(),
                     selected: false,
                 },
                 BrowserListEntry {
                     type_: BrowserListEntryType::AudioFile,
                     text: "test_file_6.wav".into(),
                     selected: false,
                 },
             ],
         }
     }
 }

diff --git a/src/ui/mod.rs b/src/ui/mod.rs
@@ -12,7  12,6 @@ use crate::state_system::{AppAction, StateSystem};
 
 use self::panels::{bottom_bar, browser_panel, side_tab_bar, top_bar};
 
-pub mod icon;
 pub mod panels;
 pub mod views;
 

diff --git a/src/ui/panels/bottom_bar.rs b/src/ui/panels/bottom_bar.rs
@@ -1,14  1,15 @@
 use vizia::prelude::*;
 
-use crate::ui::icon::{Icon, IconCode};
 use crate::ui::views::{Icon, IconCode};
 
 pub fn bottom_bar(cx: &mut Context) {
     HStack::new(cx, |cx| {
-        Button::new(cx, |_| {}, |cx| Icon::new(cx, IconCode::Home, 28.0, 20.0)).class("icon_btn");
         Button::new(cx, |_| {}, |cx| Icon::new(cx, IconCode::Home, 22.0, 20.0)).class("icon_btn");
 
-        Button::new(cx, |_| {}, |cx| Icon::new(cx, IconCode::Terminal, 28.0, 20.0))
         Button::new(cx, |_| {}, |cx| Icon::new(cx, IconCode::Terminal, 22.0, 20.0))
             .class("icon_btn")
             .left(Stretch(1.0));
     })
     .height(Pixels(26.0))
     .class("bottom_bar");
 }