styles: working on making it look just right

src/main.rs

@@ -7,9 +7,10 @@ mod key_bindings;
 mod message;
 mod state;
 
-use iced::Theme;
+use iced::theme::Palette;
 use iced::widget::column;
 use iced::window::icon;
+use iced::{Color, Theme};
 use iced::{Element, Subscription, Task, event};
 use iced::{keyboard, window};
 
@@ -17,69 +18,76 @@ use crate::message::Message;
 use crate::state::State;
 
 pub fn main() -> iced::Result {
-    iced::application(boot, update, view)
-        .subscription(subscription)
-        .font(constants::CUSTOM_FONT_BYTES)
-        .theme(theme)
-        .settings(iced::Settings {
-            default_font: constants::CUSTOM_FONT,
-            ..Default::default()
-        })
-        .window(window::Settings {
-            icon: Some(
-                icon::from_file_data(constants::ICON_BYTES, None).expect("Failed to load icon"),
-            ),
-            ..window::Settings::default()
-        })
-        .run()
+  iced::application(boot, update, view)
+    .subscription(subscription)
+    .font(constants::CUSTOM_FONT_BYTES)
+    .theme(theme)
+    .settings(iced::Settings {
+      default_font: constants::CUSTOM_FONT,
+      ..Default::default()
+    })
+    .window(window::Settings {
+      icon: Some(icon::from_file_data(constants::ICON_BYTES, None).expect("Failed to load icon")),
+      ..window::Settings::default()
+    })
+    .run()
 }
 
 fn boot() -> State {
-    state::State::new()
+  state::State::new()
 }
 
 fn update(state: &mut State, message: Message) -> Task<Message> {
-    match message {
-        Message::Edit(action) => handler::edit(state, action),
-        Message::SwitchTab(index) => handler::switch_tab(state, index),
-        Message::LinkClicked(url) => handler::link_clicked(url),
-        Message::FileActionSelected(action) => handler::file_action(state, action),
-        Message::ViewActionSelected(action) => handler::view_action(state, action),
-        Message::FileOpened(result) => handler::opened_file(state, result),
-        Message::FileSaved(result) => handler::saved_file(state, result),
-    }
+  match message {
+    Message::Edit(action) => handler::edit(state, action),
+    Message::SwitchTab(index) => handler::switch_tab(state, index),
+    Message::LinkClicked(url) => handler::link_clicked(url),
+    Message::FileActionSelected(action) => handler::file_action(state, action),
+    Message::ViewActionSelected(action) => handler::view_action(state, action),
+    Message::FileOpened(result) => handler::opened_file(state, result),
+    Message::FileSaved(result) => handler::saved_file(state, result),
+  }
 }
 
 fn view(state: &State) -> Element<'_, Message> {
-    let current_file = state.active_file();
+  let current_file = state.active_file();
 
-    column![
-        components::tabs::view(state.files(), state.current_file_index()),
-        components::action_bar::view(state.selected_file_action(), state.selected_view_action()),
-        components::editor::view(current_file, state.mode(), state.font_size()),
-        components::status_bar::view(current_file),
-    ]
-    .padding(10)
-    .into()
+  column![
+    components::tabs::view(state.files(), state.current_file_index()),
+    components::action_bar::view(state.selected_file_action(), state.selected_view_action()),
+    components::editor::view(current_file, state.mode(), state.font_size()),
+    components::status_bar::view(current_file),
+  ]
+  .into()
 }
 
 fn subscription(_state: &State) -> Subscription<Message> {
-    event::listen_with(|e, _status, _win| -> Option<Message> {
-        match e {
-            iced::Event::Keyboard(keyboard::Event::KeyPressed { key, modifiers, .. }) => {
-                for vb in key_bindings::ALL {
-                    if vb.should_handle(&key, &modifiers) {
-                        return Some(vb.message());
-                    }
-                }
-
-                None
-            }
-            _ => None,
+  event::listen_with(|e, _status, _win| -> Option<Message> {
+    match e {
+      iced::Event::Keyboard(keyboard::Event::KeyPressed { key, modifiers, .. }) => {
+        for vb in key_bindings::ALL {
+          if vb.should_handle(&key, &modifiers) {
+            return Some(vb.message());
+          }
         }
-    })
+
+        None
+      }
+      _ => None,
+    }
+  })
 }
 
 fn theme(_state: &State) -> Theme {
-    Theme::Dark
+  Theme::custom(
+    "Win11 Dark",
+    Palette {
+      background: Color::from_rgb8(0x20, 0x20, 0x20),
+      text: Color::from_rgb8(0xF2, 0xF2, 0xF2),
+      primary: Color::from_rgb8(0x2C, 0x2C, 0x2C),
+      success: Color::from_rgb8(0x4C, 0xC3, 0x8A),
+      warning: Color::from_rgb8(0xF5, 0xC8, 0x4B),
+      danger: Color::from_rgb8(0xE8, 0x6A, 0x6A),
+    },
+  )
 }