diff --git a/src/ui/app.rs b/src/ui/app.rs index befa8c3..0bf525b 100644 --- a/src/ui/app.rs +++ b/src/ui/app.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use egui::{CentralPanel, TopBottomPanel}; +use egui::{CentralPanel, Style, TopBottomPanel, Visuals}; use crate::domain::connection::ConnectionStatus; use crate::domain::file_entry::{EntryKind, FileEntry}; @@ -15,8 +15,6 @@ use crate::ui::panels::status_bar; use crate::ui::panels::tabs; use crate::ui::panels::toolbar; -const ACCENT: egui::Color32 = egui::Color32::from_rgb(100, 80, 220); - pub struct FileManagerApp { pub state: crate::ui::state::AppState, pub registry: Arc, @@ -154,9 +152,10 @@ impl eframe::App for FileManagerApp { if self.first_frame { self.first_frame = false; - let mut style = (*ctx.style()).clone(); - style.visuals.selection.stroke.color = ACCENT; - style.visuals.widgets.active.bg_fill = ACCENT; + let style = Style { + visuals: Visuals::dark(), + ..Default::default() + }; ctx.set_style(style); ctx.request_repaint(); @@ -265,8 +264,7 @@ impl eframe::App for FileManagerApp { }); ui.add_space(12.0); - let conn_btn = egui::Button::new("Connect") - .fill(ACCENT) + let conn_btn = egui::Button::new("Connect") .min_size(egui::vec2(200.0, 32.0)); if ui.add(conn_btn).clicked() { self.state.connect_host = self.state.onboarding_host.clone(); diff --git a/src/ui/panels/queue.rs b/src/ui/panels/queue.rs index 56bdd06..8aec11e 100644 --- a/src/ui/panels/queue.rs +++ b/src/ui/panels/queue.rs @@ -58,7 +58,6 @@ pub fn render(ui: &mut egui::Ui, _state: &mut AppState, tasks: &[TransferTask]) let pct = task.progress_pct(); let pb = egui::ProgressBar::new(pct as f32 / 100.0) .text(format!("{:.1}%", pct)) - .fill(egui::Color32::from_rgb(100, 80, 220)) .desired_width(ui.available_width() * 0.6); ui.add(pb); diff --git a/src/ui/panels/tabs.rs b/src/ui/panels/tabs.rs index f7a4594..8d00d42 100644 --- a/src/ui/panels/tabs.rs +++ b/src/ui/panels/tabs.rs @@ -1,8 +1,6 @@ use crate::domain::connection::ConnectionStatus; use crate::ui::state::AppState; -const ACCENT: egui::Color32 = egui::Color32::from_rgb(100, 80, 220); - pub fn render(ui: &mut egui::Ui, state: &mut AppState) { ui.horizontal(|ui| { let mut to_close: Option = None; @@ -22,7 +20,7 @@ pub fn render(ui: &mut egui::Ui, state: &mut AppState) { let mut tab_btn = egui::Button::new(&label) .min_size(egui::vec2(60.0, 28.0)); if is_active { - tab_btn = tab_btn.fill(ACCENT); + tab_btn = tab_btn.fill(egui::Color32::from_rgb(60, 60, 70)); } if ui.add(tab_btn).clicked() { state.active_tab = i; diff --git a/src/ui/panels/toolbar.rs b/src/ui/panels/toolbar.rs index 0b45d5c..e719e22 100644 --- a/src/ui/panels/toolbar.rs +++ b/src/ui/panels/toolbar.rs @@ -2,9 +2,7 @@ use crate::ui::state::AppState; pub fn render(ui: &mut egui::Ui, state: &mut AppState) { ui.horizontal(|ui| { - let add_btn = egui::Button::new("+ New Connection") - .fill(egui::Color32::from_rgb(80, 60, 180)); - if ui.add(add_btn).clicked() { + if ui.button("+ New Connection").clicked() { state.show_connect_dialog = true; } });