Add image dimension and file size information (#21675)
Closes https://github.com/zed-industries/zed/issues/21281 @jansol, kindly take a look when you're free.  Release Notes: - Added dimensions and file size information for images. --------- Co-authored-by: tims <0xtimsb@gmail.com> Co-authored-by: Marshall Bowers <git@maxdeviant.com>
This commit is contained in:
parent
a1ed1a00b3
commit
d6d0d7d3e4
10 changed files with 312 additions and 10 deletions
|
@ -13,7 +13,7 @@ path = "src/image_viewer.rs"
|
|||
doctest = false
|
||||
|
||||
[features]
|
||||
test-support = ["gpui/test-support"]
|
||||
test-support = ["gpui/test-support", "editor/test-support"]
|
||||
|
||||
[dependencies]
|
||||
anyhow.workspace = true
|
||||
|
@ -22,6 +22,8 @@ editor.workspace = true
|
|||
file_icons.workspace = true
|
||||
gpui.workspace = true
|
||||
project.workspace = true
|
||||
schemars.workspace = true
|
||||
serde.workspace = true
|
||||
settings.workspace = true
|
||||
theme.workspace = true
|
||||
ui.workspace = true
|
||||
|
|
124
crates/image_viewer/src/image_info.rs
Normal file
124
crates/image_viewer/src/image_info.rs
Normal file
|
@ -0,0 +1,124 @@
|
|||
use gpui::{div, Context, Entity, IntoElement, ParentElement, Render, Subscription};
|
||||
use project::image_store::{ImageFormat, ImageMetadata};
|
||||
use settings::Settings;
|
||||
use ui::prelude::*;
|
||||
use workspace::{ItemHandle, StatusItemView, Workspace};
|
||||
|
||||
use crate::{ImageFileSizeUnit, ImageView, ImageViewerSettings};
|
||||
|
||||
pub struct ImageInfo {
|
||||
metadata: Option<ImageMetadata>,
|
||||
_observe_active_image: Option<Subscription>,
|
||||
observe_image_item: Option<Subscription>,
|
||||
}
|
||||
|
||||
impl ImageInfo {
|
||||
pub fn new(_workspace: &Workspace) -> Self {
|
||||
Self {
|
||||
metadata: None,
|
||||
_observe_active_image: None,
|
||||
observe_image_item: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn update_metadata(&mut self, image_view: &Entity<ImageView>, cx: &mut Context<Self>) {
|
||||
let image_item = image_view.read(cx).image_item.clone();
|
||||
let current_metadata = image_item.read(cx).image_metadata;
|
||||
if current_metadata.is_some() {
|
||||
self.metadata = current_metadata;
|
||||
cx.notify();
|
||||
} else {
|
||||
self.observe_image_item = Some(cx.observe(&image_item, |this, item, cx| {
|
||||
this.metadata = item.read(cx).image_metadata;
|
||||
cx.notify();
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn format_file_size(size: u64, image_unit_type: ImageFileSizeUnit) -> String {
|
||||
match image_unit_type {
|
||||
ImageFileSizeUnit::Binary => {
|
||||
if size < 1024 {
|
||||
format!("{size}B")
|
||||
} else if size < 1024 * 1024 {
|
||||
format!("{:.1}KiB", size as f64 / 1024.0)
|
||||
} else {
|
||||
format!("{:.1}MiB", size as f64 / (1024.0 * 1024.0))
|
||||
}
|
||||
}
|
||||
ImageFileSizeUnit::Decimal => {
|
||||
if size < 1000 {
|
||||
format!("{size}B")
|
||||
} else if size < 1000 * 1000 {
|
||||
format!("{:.1}KB", size as f64 / 1000.0)
|
||||
} else {
|
||||
format!("{:.1}MB", size as f64 / (1000.0 * 1000.0))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Render for ImageInfo {
|
||||
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
||||
let settings = ImageViewerSettings::get_global(cx);
|
||||
|
||||
let Some(metadata) = self.metadata.as_ref() else {
|
||||
return div();
|
||||
};
|
||||
|
||||
let mut components = Vec::new();
|
||||
components.push(format!("{}x{}", metadata.width, metadata.height));
|
||||
components.push(format_file_size(metadata.file_size, settings.unit));
|
||||
|
||||
if let Some(colors) = metadata.colors {
|
||||
components.push(format!(
|
||||
"{} channels, {} bits per pixel",
|
||||
colors.channels,
|
||||
colors.bits_per_pixel()
|
||||
));
|
||||
}
|
||||
|
||||
components.push(
|
||||
match metadata.format {
|
||||
ImageFormat::Png => "PNG",
|
||||
ImageFormat::Jpeg => "JPEG",
|
||||
ImageFormat::Gif => "GIF",
|
||||
ImageFormat::WebP => "WebP",
|
||||
ImageFormat::Tiff => "TIFF",
|
||||
ImageFormat::Bmp => "BMP",
|
||||
ImageFormat::Ico => "ICO",
|
||||
ImageFormat::Avif => "Avif",
|
||||
_ => "Unknown",
|
||||
}
|
||||
.to_string(),
|
||||
);
|
||||
|
||||
div().child(
|
||||
Button::new("image-metadata", components.join(" • ")).label_size(LabelSize::Small),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl StatusItemView for ImageInfo {
|
||||
fn set_active_pane_item(
|
||||
&mut self,
|
||||
active_pane_item: Option<&dyn ItemHandle>,
|
||||
_window: &mut Window,
|
||||
cx: &mut Context<Self>,
|
||||
) {
|
||||
self._observe_active_image = None;
|
||||
self.observe_image_item = None;
|
||||
|
||||
if let Some(image_view) = active_pane_item.and_then(|item| item.act_as::<ImageView>(cx)) {
|
||||
self.update_metadata(&image_view, cx);
|
||||
|
||||
self._observe_active_image = Some(cx.observe(&image_view, |this, view, cx| {
|
||||
this.update_metadata(&view, cx);
|
||||
}));
|
||||
} else {
|
||||
self.metadata = None;
|
||||
}
|
||||
cx.notify();
|
||||
}
|
||||
}
|
|
@ -1,3 +1,6 @@
|
|||
mod image_info;
|
||||
mod image_viewer_settings;
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
use anyhow::Context as _;
|
||||
|
@ -19,7 +22,8 @@ use workspace::{
|
|||
ItemId, ItemSettings, ToolbarItemLocation, Workspace, WorkspaceId,
|
||||
};
|
||||
|
||||
const IMAGE_VIEWER_KIND: &str = "ImageView";
|
||||
pub use crate::image_info::*;
|
||||
pub use crate::image_viewer_settings::*;
|
||||
|
||||
pub struct ImageView {
|
||||
image_item: Entity<ImageItem>,
|
||||
|
@ -31,7 +35,6 @@ impl ImageView {
|
|||
pub fn new(
|
||||
image_item: Entity<ImageItem>,
|
||||
project: Entity<Project>,
|
||||
|
||||
cx: &mut Context<Self>,
|
||||
) -> Self {
|
||||
cx.subscribe(&image_item, Self::on_image_event).detach();
|
||||
|
@ -49,7 +52,9 @@ impl ImageView {
|
|||
cx: &mut Context<Self>,
|
||||
) {
|
||||
match event {
|
||||
ImageItemEvent::FileHandleChanged | ImageItemEvent::Reloaded => {
|
||||
ImageItemEvent::MetadataUpdated
|
||||
| ImageItemEvent::FileHandleChanged
|
||||
| ImageItemEvent::Reloaded => {
|
||||
cx.emit(ImageViewEvent::TitleChanged);
|
||||
cx.notify();
|
||||
}
|
||||
|
@ -188,7 +193,7 @@ fn breadcrumbs_text_for_image(project: &Project, image: &ImageItem, cx: &App) ->
|
|||
|
||||
impl SerializableItem for ImageView {
|
||||
fn serialized_item_kind() -> &'static str {
|
||||
IMAGE_VIEWER_KIND
|
||||
"ImageView"
|
||||
}
|
||||
|
||||
fn deserialize(
|
||||
|
@ -357,8 +362,9 @@ impl ProjectItem for ImageView {
|
|||
}
|
||||
|
||||
pub fn init(cx: &mut App) {
|
||||
ImageViewerSettings::register(cx);
|
||||
workspace::register_project_item::<ImageView>(cx);
|
||||
workspace::register_serializable_item::<ImageView>(cx)
|
||||
workspace::register_serializable_item::<ImageView>(cx);
|
||||
}
|
||||
|
||||
mod persistence {
|
||||
|
|
42
crates/image_viewer/src/image_viewer_settings.rs
Normal file
42
crates/image_viewer/src/image_viewer_settings.rs
Normal file
|
@ -0,0 +1,42 @@
|
|||
use gpui::App;
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use settings::{Settings, SettingsSources};
|
||||
|
||||
/// The settings for the image viewer.
|
||||
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Default)]
|
||||
pub struct ImageViewerSettings {
|
||||
/// The unit to use for displaying image file sizes.
|
||||
///
|
||||
/// Default: "binary"
|
||||
#[serde(default)]
|
||||
pub unit: ImageFileSizeUnit,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, Default)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum ImageFileSizeUnit {
|
||||
/// Displays file size in binary units (e.g., KiB, MiB).
|
||||
#[default]
|
||||
Binary,
|
||||
/// Displays file size in decimal units (e.g., KB, MB).
|
||||
Decimal,
|
||||
}
|
||||
|
||||
impl Settings for ImageViewerSettings {
|
||||
const KEY: Option<&'static str> = Some("image_viewer");
|
||||
|
||||
type FileContent = Self;
|
||||
|
||||
fn load(
|
||||
sources: SettingsSources<Self::FileContent>,
|
||||
_: &mut App,
|
||||
) -> Result<Self, anyhow::Error> {
|
||||
SettingsSources::<Self::FileContent>::json_merge_with(
|
||||
[sources.default]
|
||||
.into_iter()
|
||||
.chain(sources.user)
|
||||
.chain(sources.server),
|
||||
)
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue