Merge branch 'window-icon' into 'main'

Add support for setting initial window icon

See merge request verso-browser/verso!325

Author: pewsheen

src/config.rs

@@ -323,7 +323,10 @@ impl Config {
         let mut window_attributes = winit::window::Window::default_attributes()
             .with_transparent(config.transparent)
             .with_decorations(config.decorated)
-            .with_title(config.title.unwrap_or("Verso".to_owned()));
+            .with_title(config.title.unwrap_or("Verso".to_owned()))
+            .with_window_icon(config.icon.and_then(|icon| {
+                winit::window::Icon::from_rgba(icon.rgba, icon.width, icon.height).ok()
+            }));
         // set min inner size
         // should be at least able to show the whole control panel
         // FIXME: url input has weird behavior that will expand lager when having long text

verso/src/builder.rs

@@ -74,6 +74,12 @@ impl VersoBuilder {
         self
     }
 
+    /// Sets the window icon.
+    pub fn icon(mut self, icon: versoview_messages::Icon) -> Self {
+        self.0.icon = Some(icon);
+        self
+    }
+
     /// Port number to start a server to listen to remote Firefox devtools connections. 0 for random port.
     pub fn devtools_port(mut self, port: u16) -> Self {
         self.0.devtools_port = Some(port);

verso/src/lib.rs

@@ -9,7 +9,9 @@ use std::{
     process::Command,
     sync::{Arc, Mutex, mpsc::Sender as MpscSender},
 };
-pub use versoview_messages::{ConfigFromController as VersoviewSettings, ProfilerSettings};
+pub use versoview_messages::{
+    ConfigFromController as VersoviewSettings, Icon, ProfilerSettings, UserScript,
+};
 use versoview_messages::{
     PositionType, SizeType, ToControllerMessage, ToVersoMessage, WebResourceRequest,
     WebResourceRequestResponse,

versoview_messages/src/lib.rs

@@ -136,6 +136,8 @@ pub struct ConfigFromController {
     pub transparent: bool,
     /// Title of the initial winit window in the title bar.
     pub title: Option<String>,
+    /// Window icon of the initial winit window.
+    pub icon: Option<Icon>,
     /// Port number to start a server to listen to remote Firefox devtools connections. 0 for random port.
     pub devtools_port: Option<u16>,
     /// Servo time profile settings
@@ -164,6 +166,7 @@ impl Default for ConfigFromController {
             decorated: false,
             transparent: true,
             title: None,
+            icon: None,
             fullscreen: false,
             devtools_port: None,
             profiler_settings: None,
@@ -175,6 +178,16 @@ impl Default for ConfigFromController {
     }
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct Icon {
+    /// RGBA bytes of the icon.
+    pub rgba: Vec<u8>,
+    /// Icon width.
+    pub width: u32,
+    /// Icon height.
+    pub height: u32,
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct UserScript {
     pub script: String,