-
Notifications
You must be signed in to change notification settings - Fork 3.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add image dimension and file size information #21675
base: main
Are you sure you want to change the base?
Add image dimension and file size information #21675
Conversation
We require contributors to sign our Contributor License Agreement, and we don't have @kaf-lamed-beyt on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
@cla-bot check |
The cla-bot has been summoned, and re-checked this pull request! |
@kaf-lamed-beyt :
You can take a screenshot of the image located at the following path: I don't understand why Vscode: Webstorm: |
Alright! Thank you for the feedback @Angelk90. I'll take the screenshot and share it here. Quick question though... which crate would I need to update to show this image data in the location you asked me to move it? I'm thinking this one: Perhaps, using the |
@kaf-lamed-beyt : Maybe I figured out why the size of kB = 1,000 bytes (Decimal system, preferred in commercial and in the most recent specifications). But the calculations do not work: 194,360 bytes (webstorm size) − 194,030 bytes = 330 bytes Anyway, an important point in my opinion is the convention of whether to use a
To understand where best to put this information I think you need to ask @danilo-leal. Personally I don't like the file path being visible, if it were possible from the settings I would remove it from mine. @kaf-lamed-beyt : If you can show this information for the images too that would be great. |
Oh! Now I understand the reason for the disparity in file size. So what do you recommend we use in this case @Angelk90? the binary or decimal system? We can decide to accommodate both of them though. If that's okay
cool I'll include this too. |
@danilo-leal, hi 👋🏼 any idea how I can include the image metadata in the status bar? |
@kaf-lamed-beyt : https://github.com/zed-industries/zed/blob/main/assets/settings/default.json {
"system_type": "binary"
} default {
"decimal_separator": "dot", // dot or comma
} Same thing as above. example code: fn format_size(size: u64, base: f64, units: &[&str], separator: char) -> String {
let mut size_in_units = size as f64;
let mut unit_index = 0;
while size_in_units >= base && unit_index < units.len() - 1 {
size_in_units /= base;
unit_index += 1;
}
let formatted_size = format!("{:.2}", size_in_units);
let formatted_size = match separator {
',' => formatted_size.replace('.', ","),
_ => formatted_size
};
format!("{} {}", formatted_size, units[unit_index])
}
fn format_size_decimal(size: u64, separator: char) -> String {
let units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
format_size(size, 1000.0, &units, separator)
}
fn format_size_binary(size: u64, separator: char) -> String {
let units = ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"];
format_size(size, 1024.0, &units, separator)
} We'll have to see what the maintainers think of these choices. |
That was fast! Nice work so far!
Don't. That won't work well if someone opens multiple images side by side. Also there is very limited space in the status bar and I would very much like to see a lot more metadata (file format; color format - channels, bit depth, subsampling, etc; physical size/DPI; comment; whether the file has color profile; ...) As far as I've seen, most applications tend to put metadata in an overlay or a side bar. I think @iamnbutler is the one that should be consulted on that, as he is the main designer in the Zed team AIUI. You might want to arrange a collab call with him to decide on the UI design portion of this. |
@jansol :
Where and how?
Depending on which image the tab focus is on, information is displayed just like vscode does. However, I agree with the choice of having a side menu for file information, as xcode does. |
Thank you, @jansol!
Oh! That's good then. This is a valid reason. I'd check if the image crate can provide all these metadata you mentioned. What's the best way to reach @iamnbutler? Email? Twitter? Discord (I may need the discord handle) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Personally, I prefer the VSCode style with the size and dimensions in the status bar. You can define a new status bar item in the image_viewer
crate, and then add it after the cursor position indicator here:
Lines 214 to 222 in d7ea3dd
workspace.status_bar().update(cx, |status_bar, cx| { | |
status_bar.add_left_item(diagnostic_summary, cx); | |
status_bar.add_left_item(activity_indicator, cx); | |
status_bar.add_right_item(inline_completion_button, cx); | |
status_bar.add_right_item(active_buffer_language, cx); | |
status_bar.add_right_item(active_toolchain_language, cx); | |
status_bar.add_right_item(vim_mode_indicator, cx); | |
status_bar.add_right_item(cursor_position, cx); | |
}); |
crates/image_viewer/Cargo.toml
Outdated
@@ -23,3 +23,4 @@ theme.workspace = true | |||
ui.workspace = true | |||
util.workspace = true | |||
workspace.workspace = true | |||
image = "0.25.5" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's elevate this dependency, and the one in GPUI, to a workspace dependency
@mikayla-maki : what @jansol proposed cannot be done. Let's see what @iamnbutler says. |
@mikayla-maki am i on the right path? I've managed to get a UI element to render in the status bar. But, I do not think the zed/crates/project/src/image_store.rs Lines 135 to 157 in b27afc4
Perhaps, you could point me in the right direction? |
Hey, sorry I'm terrible at keeping up with activity here. My first instinct is that the bottom right of the toolbar should be used to show this metadata. In buffers, that is cursor position, selected lines, characters, etc. So for images it would make sense for it to show file size, dimensions, etc. There is the downside that @jansol mentions, that you can't do comparisons in this way. I wouldn't be opposed to us exploring other options such as overlays, but I would not put this info in the toolbar, as it is intended for controls. If we had sub-splits already (in-buffer sidebars) I would suggest adding a |
Thanks for the feedback @iamnbutler! The approach I'm taking is in line with what you mentioned here
But, I have difficulty getting the image metadata to show up there. I successfully got a UI element to render in the status(tool)bar:a placeholder. So any help, reviewing what I'm doing wrong, would be very much appreciated. If we decide to have a sub-split like you the image description you shared, where or which crates should I be focusing on for this implementation? This is my first "real" rodeo with Rust, so you'll please excuse my questions 👐🏼. Thanks! |
You'll have to figure it out if you want to ship this PR :). I'd suggest looking at the cursor position UI, and learning how it's hooked into the rest of Zed. The key trait you'll want to understand is zed/crates/go_to_line/src/cursor_position.rs Lines 212 to 232 in 2ff06ce
I'm going to mark this as a draft for now, feel free to mark it as ready once you have a new implementation utilizing the status bar working. Good luck and happy holidays! |
Thank you @mikayla-maki! I've been going through the CursorPosition implementation, actually. But, I'll go with your suggestion and approach everything carefully now. I'll make sure to mark this PR as ready when I'm set. Happy holidays! |
The standard fs crate does filesystem operations synchronously which may lead to blocking the main thread when trying to access the image metadata, specifically fs.metadata to obtain the file size. This PR addresses that issue, and also renders other image information like the dimensions (width & height), and the image type (PNG|JPG etc)
@mikayla-maki, kindly take a look when you get the chance. Thanks! |
@kaf-lamed-beyt : There seems to be too much space between the text and the copilot icon and I would then add a separation as seen in the second image. For units of measurement some prefer 1024 others 1000, I would let the user choose which one to use via settings, I would set the default to 1024. |
Oh! I'll look into the spacing issue and that divider in the UI too. I'd take a look at the settings crate to see how I can make the file meta unit customizable. |
People should now be able to set their preferred unit types. The image below uses the "decimal" unit Here's how: For the spacing issue @Angelk90, it is there by default. See an example of what it looks like in the current Zed version I have on my machine. The space between the For the vertical divider... I couldn't find how it was implemented. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Making a lot of progress! There's a couple things that need to be re-arranged though. You'll also need to get CI passing before we can merge this :)
That said, the feature itself is looking really good! Excited to have this.
crates/project/src/image_store.rs
Outdated
if let Ok(()) = image_model.update(&mut cx, |image, cx| { | ||
let project_ref = project_clone.read(cx); | ||
|
||
if let Ok(metadata) = futures::executor::block_on(image.load_metadata( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be blocked on. Rather, return it out of the .update()
, then .await
it, then call update()
again to assign the results.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh! thanks, i'll try this now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mikayla-maki, I did some cleanups. Kindly review and let me know what you think.
The only issue I have is in this block. When I try to do it like you said — regarding this executor::block_on
— I run into Rust lifetime issues several times.
Perhaps a little nudge in the right direction? thanks!
crates/settings/src/settings.rs
Outdated
@@ -66,6 +66,8 @@ pub fn init(cx: &mut AppContext) { | |||
.set_default_settings(&default_settings(), cx) | |||
.unwrap(); | |||
cx.set_global(settings); | |||
|
|||
ImageFileSizeUnitType::register(cx); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be registered here. This should be in an init()
function in the image_info
file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So for this scenario... i tried having an exact init
function in ImageItem
But I kept on running into an error. This one specifically.
Thread "main" panicked with "unregistered setting type image_viewer::image_info::ImageFileSizeUnitType" at /oss/zed/crates/settings/src/settings_store.rs:341:32
0: zed::reliability::init_panic_hook::{{closure}}
So to avoid it, I ended up using call_once
from std::sync
like this 👇🏼 so it doesn't call ::register()
everytime the statusItem mounts
pub fn new(_workspace: &Workspace, cx: &mut AppContext) -> Self {
static INIT: std::sync::Once = std::sync::Once::new();
INIT.call_once(|| {
ImageFileSizeUnitType::register(cx);
});
Lemme know if this is okay.
Ayy! I'm happy to hear this @mikayla-maki! I'll go over the changes you've suggested and push tthem |
… worktree-abspath
Awesome! I'll mark this as draft for now. Let me know when it's next ready for review :) |
@mikayla-maki, can you take a look now? |
Closes #21281
@jansol, kindly take a look when you're free.
Release Notes: