Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(tui)!: query the terminal background once #62

Merged
merged 1 commit into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion examples/demo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn main() -> Result<()> {
file_data.as_slice(),
)?;
let analyzer = Analyzer::new(file_info, 15, vec![])?;
let mut state = State::new(analyzer)?;
let mut state = State::new(analyzer, None)?;
let (sender, receiver) = mpsc::channel();
state.analyzer.extract_strings(sender.clone());

Expand Down
5 changes: 5 additions & 0 deletions src/args.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use clap::Parser;
use ratatui::style::Color;
use std::path::PathBuf;

use crate::tui::ui::Tab;
Expand Down Expand Up @@ -31,6 +32,10 @@ pub struct Args {
/// The initial application tab to open.
#[arg(env, short = 't', long = "tab", default_value = "general")]
pub tab: Tab,

/// Accent color of the application.
#[arg(env, long, value_name = "COLOR")]
pub accent_color: Option<Color>,
}

#[cfg(test)]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub fn run(mut args: Args) -> Result<()> {
/// Starts the terminal user interface.
pub fn start_tui(analyzer: Analyzer, args: Args) -> Result<()> {
// Create an application.
let mut state = State::new(analyzer)?;
let mut state = State::new(analyzer, args.accent_color)?;

// Change tab depending on cli arguments.
state.set_tab(args.tab);
Expand Down
16 changes: 15 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
use binsider::args::Args;
use binsider::error::Result;
use clap::Parser;
use ratatui::style::Color;
use std::process;
use std::time::Duration;
use termbg::Theme;

fn main() -> Result<()> {
let args = Args::parse();
let mut args = Args::parse();
if args.accent_color.is_none() {
args.accent_color = termbg::theme(Duration::from_millis(10))
.map(|theme| {
if theme == Theme::Dark {
Color::White
} else {
Color::Black
}
})
.ok();
}
match binsider::run(args) {
Ok(_) => process::exit(0),
Err(e) => {
Expand Down
14 changes: 2 additions & 12 deletions src/tui/state.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::path::PathBuf;
use std::sync::mpsc;
use std::time::Duration;

use crate::error::{Error, Result};
use crate::prelude::Analyzer;
Expand All @@ -12,7 +11,6 @@ use crate::tui::widgets::logo::Logo;
use ansi_to_tui::IntoText;
use heh::windows::Window;
use ratatui::style::Color;
use termbg::Theme;
use tui_input::backend::crossterm::EventHandler;
use tui_input::Input;

Expand Down Expand Up @@ -59,7 +57,7 @@ pub struct State<'a> {

impl<'a> State<'a> {
/// Constructs a new instance of [`State`].
pub fn new(analyzer: Analyzer<'a>) -> Result<Self> {
pub fn new(analyzer: Analyzer<'a>, accent_color: Option<Color>) -> Result<Self> {
let mut state = Self {
running: true,
tab: Tab::default(),
Expand All @@ -77,15 +75,7 @@ impl<'a> State<'a> {
general_scroll_index: 0,
notes_scroll_index: 0,
headers_scroll_index: 0,
accent_color: termbg::theme(Duration::from_millis(10))
.map(|theme| {
if theme == Theme::Dark {
Color::White
} else {
Color::Black
}
})
.unwrap_or(Color::White),
accent_color: accent_color.unwrap_or(Color::White),
logo: Logo::default(),
};
state.handle_tab()?;
Expand Down
2 changes: 1 addition & 1 deletion website/src/content/docs/extras/library.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Then you can create a `Analyzer` struct and `State` for managing the TUI state:
use binsider::prelude::*;

let analyzer = Analyzer::new(file_info, 15, vec![])?;
let mut state = State::new(analyzer)?;
let mut state = State::new(analyzer, None)?;
```

To render a frame:
Expand Down