fjordgard

commit dcf3a62233efda62d14d2d30e6dfc7e8211d19fc
parent 349103432936b7c5ac8f3f0873984a640a5d9a26
Author: Sylvia Ivory <git@sivory.net>
Date:   Thu, 19 Jun 2025 19:39:39 -0700

Request images the size of main window

Diffstat:
M
src/background.rs
 | 
11
+++++++++--
M
src/main.rs
 | 
22
+++++++++++++++++++---

2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/background.rs b/src/background.rs
@@ -49,6 +49,7 @@ pub struct UnsplashState {
 pub struct BackgroundHandle {
     pub mode: BackgroundMode,
     background: String,
+    size: Size,
 
     image_handle: Option<image::Handle>,
 
@@ -67,10 +68,12 @@ pub enum Message {
 }
 
 impl BackgroundHandle {
-    pub fn new(config: &Config) -> (Self, Task<Message>) {
+    pub fn new(config: &Config, size: Size) -> (Self, Task<Message>) {
         let mut handle = Self {
             mode: config.background_mode,
             background: config.background.clone(),
+            size,
+
             image_handle: None,
 
             unsplash_key: config.unsplash_key.clone(),
@@ -83,9 +86,10 @@ impl BackgroundHandle {
         (handle, task)
     }
 
-    pub fn load_config(&mut self, config: &Config) -> Task<Message> {
+    pub fn load_config(&mut self, config: &Config, size: Size) -> Task<Message> {
         self.mode = config.background_mode;
         self.background = config.background.clone();
+        self.size = size;
 
         if self.unsplash_key != config.unsplash_key {
             self.unsplash_key = config.unsplash_key.clone();
@@ -237,6 +241,7 @@ impl BackgroundHandle {
 
                         let client = client.clone();
                         let photo = photo.clone();
+                        let size = self.size.clone();
 
                         Task::future(async move {
                             client
@@ -244,6 +249,8 @@ impl BackgroundHandle {
                                     &photo,
                                     Some(PhotoFetchOptions {
                                         fm: Some(Format::Png),
+                                        w: Some(size.width.round().into()),
+                                        h: Some(size.height.round().into()),
                                         ..Default::default()
                                     }),
                                 )
diff --git a/src/main.rs b/src/main.rs
@@ -38,6 +38,7 @@ struct Fjordgard {
 
     settings_window: Option<settings::Settings>,
     main_window: window::Id,
+    main_window_size: Size,
 
     coordinate_pair: Option<(f64, f64)>,
     forecast_text: String,
@@ -60,6 +61,7 @@ enum Message {
     SettingsOpened,
     MainWindowOpened,
     WindowClosed(window::Id),
+    WindowResized((window::Id, Size)),
 
     Settings(settings::Message),
     Background(background::Message),
@@ -70,7 +72,10 @@ enum Message {
 
 impl Fjordgard {
     fn new() -> (Self, Task<Message>) {
-        let (id, open) = window::open(window::Settings::default());
+        let settings = window::Settings::default();
+        let main_window_size = settings.size.clone();
+
+        let (id, open) = window::open(settings);
         let config = Config::default();
 
         let format_string = config.time_format.clone();
@@ -79,7 +84,7 @@ impl Fjordgard {
             .unwrap();
 
         let meteo = MeteoClient::new(None).unwrap();
-        let (background, task) = BackgroundHandle::new(&config);
+        let (background, task) = BackgroundHandle::new(&config, main_window_size.clone());
 
         (
             Self {
@@ -92,6 +97,7 @@ impl Fjordgard {
 
                 settings_window: None,
                 main_window: id,
+                main_window_size,
 
                 coordinate_pair: None,
                 forecast_text: String::from("Weather unknown"),
@@ -156,6 +162,15 @@ impl Fjordgard {
                     Task::none()
                 }
             }
+            Message::WindowResized((id, size)) => {
+                if self.main_window != id {
+                    return Task::none();
+                }
+
+                self.main_window_size = size;
+
+                Task::none()
+            }
             Message::Settings(settings::Message::Committed) => {
                 let config = self.config.borrow();
                 let config_format = &config.time_format;
@@ -169,7 +184,7 @@ impl Fjordgard {
 
                 let background_task = self
                     .background
-                    .load_config(&config)
+                    .load_config(&config, self.main_window_size.clone())
                     .map(Message::Background);
 
                 let new_pair = config.location.as_ref().map(|l| (l.latitude, l.longitude));
@@ -386,6 +401,7 @@ impl Fjordgard {
             time::every(time::Duration::from_secs(60 * 15))
                 .map(|_| Message::Background(background::Message::RequestUnsplash(1))),
             window::close_events().map(Message::WindowClosed),
+            window::resize_events().map(Message::WindowResized),
         ])
     }
 }