feat: optional infobar

literally the title; except on the bottom
This commit is contained in:
electria 2026-07-30 20:17:21 -07:00
commit 7ce87e2870
Signed by: electria
SSH key fingerprint: SHA256:8LlB3ucPbBHqozqkhsNbaV5oG3SlzzqUj8FZDL6IPQs
2 changed files with 56 additions and 28 deletions

View file

@ -1,4 +1,4 @@
use std::{env, path::Path}; use std::{borrow::Cow, env, ffi::OsStr, path::Path};
use iced::{ use iced::{
Alignment, Color, Element, Length, Renderer, Subscription, Task, Theme, color, event, Alignment, Color, Element, Length, Renderer, Subscription, Task, Theme, color, event,
@ -23,6 +23,8 @@ struct State {
image_filter: widget::image::FilterMethod, image_filter: widget::image::FilterMethod,
error: Option<String>, error: Option<String>,
info: Option<String>,
infobar_shown: bool,
} }
impl State { impl State {
fn new() -> (Self, Task<Message>) { fn new() -> (Self, Task<Message>) {
@ -38,30 +40,33 @@ impl State {
(state, allocate_image) (state, allocate_image)
} }
fn view(&self) -> Element<'_, Message, Theme, Renderer> { fn view(&self) -> Element<'_, Message, Theme, Renderer> {
widget::column([ let mut main = Vec::new();
if let Some(allocation) = self.image_display.as_ref() {
widget::image::viewer(allocation.handle().clone()) main.push(if let Some(allocation) = self.image_display.as_ref() {
.filter_method(self.image_filter) widget::image::viewer(allocation.handle().clone())
.max_scale(50.) .filter_method(self.image_filter)
.min_scale(1.) .max_scale(50.)
.width(Length::Fill) .min_scale(1.)
.height(Length::Fill) .width(Length::Fill)
.into() .height(Length::Fill)
} else { .into()
widget::container(widget::text(include_str!("usage.txt"))) } else {
.height(Length::Fill) widget::container(widget::text(include_str!("usage.txt")))
.width(Length::Fill) .height(Length::Fill)
.align_x(Alignment::Center) .width(Length::Fill)
.align_y(Alignment::Center) .align_x(Alignment::Center)
.into() .align_y(Alignment::Center)
}, .into()
if let Some(error) = self.error.as_ref() { });
widget::text(error).style(widget::text::danger).into()
} else { if let Some(error) = self.error.as_ref() {
widget::space().into() main.push(widget::text(error).style(widget::text::danger).into());
}, }
]) if self.infobar_shown && self.info.is_some() {
.into() main.push(widget::text(self.title()).into());
}
widget::column(main).into()
} }
fn update(&mut self, message: Message) -> Task<Message> { fn update(&mut self, message: Message) -> Task<Message> {
match message { match message {
@ -117,6 +122,9 @@ impl State {
widget::image::FilterMethod::Nearest => widget::image::FilterMethod::Linear, widget::image::FilterMethod::Nearest => widget::image::FilterMethod::Linear,
} }
} }
Key::Character("b") => {
self.infobar_shown = !self.infobar_shown;
}
Key::Character("s") => { Key::Character("s") => {
self.save_image(); self.save_image();
@ -146,7 +154,16 @@ impl State {
} }
fn load_image(&mut self, path: impl AsRef<Path>) -> Result<Task<Message>, String> { fn load_image(&mut self, path: impl AsRef<Path>) -> Result<Task<Message>, String> {
utils::load_image(path).map(|image| { utils::load_image(&path).map(|image| {
self.info = Some(format!(
"{} {}x{}",
path.as_ref()
.file_name()
.map(OsStr::to_string_lossy)
.unwrap_or(Cow::Borrowed("[no file]")),
image.width(),
image.height(),
));
self.image = Some(image); self.image = Some(image);
self.allocate_image() self.allocate_image()
}) })
@ -177,8 +194,11 @@ impl State {
event::listen().map(Message::Event) event::listen().map(Message::Event)
} }
fn title(&self) -> String { fn title(&self) -> String {
match self.image.as_ref() { match self.info.as_ref() {
Some(image) => format!("imagey {}x{}", image.width(), image.height()), Some(info) => format!(
"imagey {info} {}",
utils::string_from_filter_type(self.image_filter),
),
None => "imagey".into(), None => "imagey".into(),
} }
} }

View file

@ -1,5 +1,6 @@
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use iced::widget;
use image::{DynamicImage, ImageDecoder, ImageReader, RgbaImage}; use image::{DynamicImage, ImageDecoder, ImageReader, RgbaImage};
use rfd::FileDialog; use rfd::FileDialog;
@ -79,3 +80,10 @@ pub fn save_image(image: Option<&RgbaImage>) -> Result<(), String> {
Ok(()) Ok(())
} }
pub fn string_from_filter_type(f: widget::image::FilterMethod) -> &'static str {
match f {
widget::image::FilterMethod::Linear => "bilinear",
widget::image::FilterMethod::Nearest => "nearest neighbor",
}
}