Add full-screen ImageViewer widget. Support storing original files and thumbnails in the MediaCache #443
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| use std::sync::Arc; | ||
| use crate::utils; | ||
|
|
||
| use makepad_widgets::*; | ||
|
|
||
| live_design! { | ||
| use link::theme::*; | ||
| use link::shaders::*; | ||
| use link::widgets::*; | ||
|
|
||
| use crate::shared::styles::*; | ||
| use crate::shared::icon_button::RobrixIconButton; | ||
|
|
||
| pub ImageViewer = {{ImageViewer}} { | ||
| visible: false | ||
| width: Fill, height: Fill | ||
| align: {x: 0.5, y: 0.5} | ||
| spacing: 12 | ||
| flow: Overlay | ||
| show_bg: true | ||
| draw_bg: { | ||
| color: (COLOR_IMAGE_VIEWER_BG) | ||
| } | ||
|
|
||
| <View> { | ||
| align: {x: 1.0, y: 0.0} | ||
| width: Fill, height: Fill | ||
| close_button = <RobrixIconButton> { | ||
| padding: {left: 15, right: 15} | ||
| draw_icon: { | ||
| svg_file: (ICON_CLOSE) | ||
| color: (COLOR_CLOSE), | ||
| } | ||
| icon_walk: {width: 25, height: 25, margin: {left: -1, right: -1} } | ||
|
|
||
| draw_bg: { | ||
| border_color: (COLOR_CLOSE_BG), | ||
| color: (COLOR_CLOSE_BG) // light red | ||
| } | ||
| } | ||
| } | ||
|
|
||
| image_view = <View> { | ||
| padding: {top: 40, bottom: 30, left: 20, right: 20} | ||
| flow: Overlay | ||
| align: {x: 0.5, y: 0.5} | ||
| width: Fill, height: Fill, | ||
| image = <Image> { | ||
| width: Fill, height: Fill, | ||
| fit: Smallest, | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Live, LiveHook, Widget)] | ||
| pub struct ImageViewer { | ||
| #[deref] | ||
| view: View, | ||
| } | ||
|
|
||
| /// Actions handled by the `ImageViewer` widget. | ||
| #[derive(Clone, Debug, DefaultNone)] | ||
| pub enum ImageViewerAction { | ||
|
There was a problem hiding this comment. actually, on second thought, it might be better to completely redesign this action like so: /// Actions handled by the `ImageViewer` widget.
#[derive(Clone, Debug, DefaultNone)]
pub enum ImageViewerAction {
/// Make the ImageViewer widget visible.
Show,
/// Set the image being displayed by the ImageViewer.
SetImage(Arc<[u8]>),
None,
}Then, when you want to show the image viewer for the first time, you emit two actions:
You'd also need to remove the There was a problem hiding this comment. It's OK but if we design it as this, we must post two actions in |
||
| /// Make the ImageViewer widget visible. | ||
| Show, | ||
| /// Set the image being displayed by the ImageViewer. | ||
| SetImage(Arc<[u8]>), | ||
| None, | ||
| } | ||
|
|
||
| impl Widget for ImageViewer { | ||
| fn handle_event(&mut self, cx: &mut Cx, event: &Event, scope: &mut Scope) { | ||
| self.match_event(cx, event); | ||
| self.view.handle_event(cx, event, scope); | ||
| } | ||
|
|
||
| fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep { | ||
| self.view.draw_walk(cx, scope, walk) | ||
| } | ||
| } | ||
| impl MatchEvent for ImageViewer { | ||
| fn handle_actions(&mut self, cx: &mut Cx, actions: &Actions) { | ||
| if self.view.button(id!(close_button)).clicked(actions) { | ||
| self.close(cx); | ||
| } | ||
|
|
||
| for action in actions { | ||
| match action.downcast_ref::<ImageViewerAction>() { | ||
| Some(ImageViewerAction::Show) => { | ||
| self.open(cx); | ||
| } | ||
| Some(ImageViewerAction::SetImage(data)) => { | ||
| self.load_with_data(cx, data); | ||
| } | ||
| _ => {} | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl ImageViewer { | ||
| fn open(&mut self, cx: &mut Cx) { | ||
| self.visible = true; | ||
| self.redraw(cx); | ||
| } | ||
| fn close(&mut self, cx: &mut Cx) { | ||
| self.visible = false; | ||
| self.view.image(id!(image_view.image)).set_texture(cx, None); | ||
| self.redraw(cx); | ||
| } | ||
| fn load_with_data(&mut self, cx: &mut Cx, data: &[u8]) { | ||
| let image = self.view.image(id!(image_view.image)); | ||
|
|
||
| if let Err(e) = utils::load_png_or_jpg(&image, cx, data) { | ||
| log!("Error to load image: {e}"); | ||
| } else { | ||
| self.view.redraw(cx); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
hmm, should we still call
image_set_keys()if thethumbnail_mxc_uriisNone?Currently, if
thumbnail_mxc_uriis None, themxc_uri_for_timelineis the same as theoriginal_mxc_uri. Why would we need to set the keys if we don't have two different URIs?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.
Of course.
Since we need to keep the correct of data structure (
BTreeMap)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.
okay, let me rephrase. Why is that necessary? what benefit does it provide?
Please elaborate, because I don't understand why this is necessary. In my mind, if the URIs are the same, we don't need to do this separate "set_keys" step, since the single URI will be inserted into the cache later once the media content is ready.
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.
kindly answer this
Uh oh!
There was an error while loading. Please reload this page.
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.
Yeah, it is what i did actually.
Note
set_keysfuction, only if the entry is vacant, we insert.If occupied, it can confirm they are same URIs, we dont insert.