fmstl

crates/core/src/app.rs

@@ -2,7 +2,7 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use iced::window;
 
-use common::{BarModule, Inbox, Service};
+use common::{BarModule, Inbox, Modules, Service};
 use toml::Table;
 
 /// Application state: module registry, routing, popup bookkeeping.
@@ -12,7 +12,7 @@ pub(crate) struct Bar {
     /// Module registry keyed by stable module id.
     pub(crate) modules: BTreeMap<&'static str, Box<dyn BarModule>>,
     /// Left, Middle, Right ; Module Order
-    pub(crate) order: (Vec<String>, Vec<String>, Vec<String>),
+    pub(crate) order: (Vec<Modules>, Vec<Modules>, Vec<Modules>),
     /// Surface id of the open popup.
     pub(crate) popup_id: Option<window::Id>,
     /// Fan-out routing table: module id -> services it wants.
@@ -25,7 +25,7 @@ pub(crate) struct Bar {
 impl Bar {
     pub(crate) fn new(
         modules_config_table: &Table,
-        modules_order: (Vec<String>, Vec<String>, Vec<String>),
+        modules_order: (Vec<Modules>, Vec<Modules>, Vec<Modules>),
     ) -> Self {
         // Registry owns construction: adding a module never edits this file.
         let modules: BTreeMap<&'static str, Box<dyn BarModule>> =

crates/core/src/main.rs

@@ -47,9 +47,19 @@ fn main() -> Result<(), iced_layershell::Error> {
     };
 
     let modules = config.modules.clone().unwrap_or_default();
+    let order = config.order;
 
     daemon(
-        move || Bar::new(&modules),
+        move || {
+            Bar::new(
+                &modules,
+                (
+                    order.left.clone(),
+                    order.middle.clone(),
+                    order.right.clone(),
+                ),
+            )
+        },
         subscription::namespace,
         update::update,
         view::view,
@@ -62,6 +72,7 @@ fn main() -> Result<(), iced_layershell::Error> {
             exclusive_zone: BAR_HEIGHT as i32,
             anchor: Anchor::Top | Anchor::Left | Anchor::Right,
             start_mode,
+            keyboard_interactivity: iced_layershell::reexport::KeyboardInteractivity::None,
             ..Default::default()
         },
         ..Default::default()

crates/core/src/view.rs

@@ -1,3 +1,4 @@
+use common::Wire;
 use iced::widget::{container, row, text};
 use iced::{window, Alignment, Element, Length, Theme};
 
@@ -15,16 +16,36 @@ pub(crate) fn view(bar: &Bar, id: window::Id) -> Element<'_, Message> {
 
 /// Each module renders itself; the bar lays them out in a row.
 fn bar_view(bar: &Bar) -> Element<'_, Message> {
-    let mut children: Vec<Element<Message>> = Vec::new();
+    // for (i, (_, module)) in bar.modules.iter().enumerate() {
+    //     children.push(module.view(None).map(|w| Message::Event(Msg::Wire(w))));
+    //     if i < bar.modules.len() - 1 {
+    //         children.push(text("|").size(14).into());
+    //     }
+    // }
+    let left = row(bar
+        .order
+        .0
+        .iter()
+        .map(|x| {
+            bar.modules
+                .get(x.to_string())
+                .unwrap()
+                .view(None)
+                .map(|w| Message::Event(Msg::Wire(w)))
+        })
+        .collect::<Vec<Element<Message>>>());
+    let middle = row(bar
+        .order
+        .1
+        .iter()
+        .map(|x| bar.modules.get(x.to_string()).unwrap().view(None)));
+    let right = row(bar
+        .order
+        .2
+        .iter()
+        .map(|x| bar.modules.get(x.to_string()).unwrap().view(None)));
 
-    for (i, (_, module)) in bar.modules.iter().enumerate() {
-        children.push(module.view(None).map(|w| Message::Event(Msg::Wire(w))));
-        if i < bar.modules.len() - 1 {
-            children.push(text("|").size(14).into());
-        }
-    }
-
-    container(row(children).width(Length::Fill).align_y(Alignment::Center))
+    container(left.width(Length::Fill).align_y(Alignment::Center))
         .padding(8)
         .align_x(Alignment::Center)
         .into()