Merge pull request #548 from squidowl/feat/popout-buffer

Feat/popout buffer
squidowl · Sep 12, 2024 · 5dce561 · 5dce561
2 parents 75a8e3f + fbdd6b7
commit 5dce561
Show file tree

Hide file tree

Showing 11 changed files with 891 additions and 411 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 Added:
 
+- Multi-window support: Pop out panes into separate windows.
 - In-app theme editor with ability to with share it via a halloy:// URL.
 - New configuration options
   - Ability to include or exclude channels for server messages (join, part, etc.). See [configuration](https://halloy.squidowl.org/configuration/buffer/server_messages/index.html).

diff --git a/assets/fontello/config.json b/assets/fontello/config.json
@@ -107,6 +107,12 @@
       "css": "docs",
       "code": 61637,
       "src": "fontawesome"
+    },
+    {
+      "uid": "ca1c07c0df52dbf2af6813c9e36c2611",
+      "css": "popup",
+      "code": 59406,
+      "src": "typicons"
     }
   ]
 }
diff --git a/data/src/dashboard.rs b/data/src/dashboard.rs
@@ -9,6 +9,8 @@ use crate::{compression, environment};
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Dashboard {
     pub pane: Pane,
+    #[serde(default)]
+    pub popout_panes: Vec<Pane>,
 }
 
 #[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]
@@ -17,6 +19,7 @@ pub enum BufferAction {
     #[default]
     NewPane,
     ReplacePane,
+    NewWindow,
 }
 
 #[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]

diff --git a/fonts/halloy-icons.ttf b/fonts/halloy-icons.ttf
diff --git a/src/icon.rs b/src/icon.rs
@@ -68,6 +68,10 @@ pub fn copy<'a>() -> Text<'a> {
     to_text('\u{F0C5}')
 }
 
+pub fn popout<'a>() -> Text<'a> {
+    to_text('\u{E80E}')
+}
+
 fn to_text<'a>(unicode: char) -> Text<'a> {
     text(unicode.to_string())
         .line_height(LineHeight::Relative(1.0))

diff --git a/src/main.rs b/src/main.rs
@@ -127,8 +127,10 @@ impl Halloy {
         main_window: window::Id,
         config_load: Result<Config, config::Error>,
     ) -> (Halloy, Task<Message>) {
+        let main_window = Window::new(main_window);
+
         let load_dashboard = |config| match data::Dashboard::load() {
-            Ok(dashboard) => screen::Dashboard::restore(dashboard, config),
+            Ok(dashboard) => screen::Dashboard::restore(dashboard, config, &main_window),
             Err(error) => {
                 log::warn!("failed to load dashboard: {error}");
 
@@ -182,7 +184,7 @@ impl Halloy {
                 servers: config.servers.clone(),
                 config,
                 modal: None,
-                main_window: Window::new(main_window),
+                main_window,
             },
             command,
         )
@@ -689,6 +691,7 @@ impl Halloy {
                                 &self.version,
                                 &self.config,
                                 &mut self.theme,
+                                &self.main_window,
                             )
                             .map(Message::Dashboard);
                     }
@@ -794,7 +797,14 @@ impl Halloy {
 
             let screen = match &self.screen {
                 Screen::Dashboard(dashboard) => dashboard
-                    .view(now, &self.clients, &self.version, &self.config, &self.theme)
+                    .view(
+                        now,
+                        &self.clients,
+                        &self.version,
+                        &self.config,
+                        &self.theme,
+                        &self.main_window,
+                    )
                     .map(Message::Dashboard),
                 Screen::Help(help) => help.view().map(Message::Help),
                 Screen::Welcome(welcome) => welcome.view().map(Message::Welcome),
@@ -817,7 +827,13 @@ impl Halloy {
             }
         } else if let Screen::Dashboard(dashboard) = &self.screen {
             dashboard
-                .view_window(id, &self.theme)
+                .view_window(
+                    id,
+                    &self.clients,
+                    &self.config,
+                    &self.theme,
+                    &self.main_window,
+                )
                 .map(Message::Dashboard)
         } else {
             column![].into()
@@ -830,6 +846,7 @@ impl Halloy {
 
         container(content)
             .padding(padding::top(height_margin))
+            .style(theme::container::general)
             .into()
     }