Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions mux/crates/mux-tui/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use ratatui::backend::CrosstermBackend;
use ratatui::Terminal as RatatuiTerminal;

use crate::browser_input::{BrowserInputDispatcher, BrowserInputEvent, BrowserInputKind};
use crate::config::{Action, Config, ScrollbarPosition};
use crate::config::{Action, ChromeTheme, Config, ScrollbarPosition};
use crate::keys;
use crate::session::{Session, SurfaceHandle, TreeView};
use crate::ui::graphics::GraphicPlacement;
Expand Down Expand Up @@ -383,6 +383,7 @@ enum Drag {
pub struct App {
pub session: Session,
pub config: Config,
pub chrome: ChromeTheme,
pub tree: TreeView,
pub render_states: HashMap<SurfaceId, RenderState>,
pub graphics_writer: Option<GraphicsWriter>,
Expand Down Expand Up @@ -546,8 +547,14 @@ fn pane_parts_for_rect(
(bar, omnibar, content, track)
}

pub fn run(session: Session, session_label: String) -> anyhow::Result<()> {
let config = crate::config::load();
pub fn run(
session: Session,
session_label: String,
default_colors: mux_core::DefaultColors,
) -> anyhow::Result<()> {
let mut config = crate::config::load();
let chrome = ChromeTheme::for_defaults(config.chrome, default_colors);
config.apply_chrome_defaults(chrome);
// First workspace before the terminal switches modes, so a spawn
// failure prints a normal error. Spawn at the size the first pane
// will actually render at (a post-spawn resize makes shells like zsh
Expand Down Expand Up @@ -635,6 +642,7 @@ pub fn run(session: Session, session_label: String) -> anyhow::Result<()> {
let mut app = App {
session,
config,
chrome,
tree: TreeView::default(),
render_states: HashMap::new(),
graphics_writer,
Expand Down Expand Up @@ -841,7 +849,8 @@ impl App {
}

fn reload_config(&mut self) {
let config = crate::config::load();
let mut config = crate::config::load();
config.apply_chrome_defaults(self.chrome);
self.session.apply_config(&config);
self.config = config;
}
Expand Down Expand Up @@ -2693,7 +2702,7 @@ mod tests {
use ratatui::Terminal;

use crate::browser_input::BrowserInputDispatcher;
use crate::config::{Config, ScrollbarPosition};
use crate::config::{ChromeTheme, Config, ScrollbarPosition};
use crate::session::tree::{PaneView, ScreenView, TabNotificationView, TabView, WorkspaceView};
use crate::session::{Session, TreeView};

Expand Down Expand Up @@ -2792,6 +2801,7 @@ mod tests {
App {
session,
config: Config::default(),
chrome: ChromeTheme::dark(),
tree: TreeView::default(),
render_states: HashMap::<u64, RenderState>::new(),
graphics_writer: None,
Expand Down
Loading
Loading