nostr/gossip
1
0
Fork 0
mirror of https://github.com/mikedilger/gossip.git synced 2024-09-29 08:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Bu5hm4nn 2023-04-28 19:03:04 -06:00
parent aa40b4df69
commit 1d15b3c333
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/media.rs
View File

@ -89,7 +89,7 @@ impl Media {
});
self.media_pending_processing.insert(url.clone());
None
},
}
None => None,
}
}

19
src/ui/feed/note/content.rs
View File

@ -284,7 +284,11 @@ fn show_image_toggle(app: &mut GossipUi, ui: &mut Ui, url: Url) {
fn try_render_image(app: &mut GossipUi, ui: &mut Ui, url: Url) -> Option<Response> {
let mut response_return = None;
if let Some(media) = app.try_get_media(ui.ctx(), url.clone()) {
let size = media_scale(app.media_full_width_list.contains(&url), ui, media.size_vec2());
let size = media_scale(
app.media_full_width_list.contains(&url),
ui,
media.size_vec2(),
);
// insert a newline if the current line has text
if ui.cursor().min.x > ui.max_rect().min.x {
@ -445,7 +449,14 @@ fn try_render_video(app: &mut GossipUi, ui: &mut Ui, url: Url) -> Option<Respons
let show_full_width = app.media_full_width_list.contains(&url);
if let Some(player_ref) = app.try_get_player(ui.ctx(), url) {
if let Ok(mut player) = player_ref.try_borrow_mut() {
let size = media_scale(show_full_width, ui, Vec2{ x: player.width as f32, y: player.height as f32 });
let size = media_scale(
show_full_width,
ui,
Vec2 {
x: player.width as f32,
y: player.height as f32,
},
);
// insert a newline if the current line has text
if ui.cursor().min.x > ui.max_rect().min.x {
@ -456,7 +467,7 @@ fn try_render_video(app: &mut GossipUi, ui: &mut Ui, url: Url) -> Option<Respons
if !show_full_width {
player.stop();
}
let response = player.ui( ui, [ size.x, size.y ] );
let response = player.ui(ui, [size.x, size.y]);
// TODO fix click action
let new_rect = response.rect.shrink(size.x / 2.0);
@ -468,7 +479,7 @@ fn try_render_video(app: &mut GossipUi, ui: &mut Ui, url: Url) -> Option<Respons
#[cfg(not(feature = "video-ffmpeg"))]
fn try_render_video(_app: &mut GossipUi, _ui: &mut Ui, _url: Url) -> Option<Response> {
return None
return None;
}
fn media_scale(show_full_width: bool, ui: &Ui, media_size: Vec2) -> Vec2 {

18
src/ui/mod.rs
View File

@ -32,6 +32,8 @@ use crate::people::DbPerson;
use crate::settings::Settings;
pub use crate::ui::theme::{Theme, ThemeVariant};
use crate::ui::widgets::CopyButton;
#[cfg(feature = "video-ffmpeg")]
use core::cell::RefCell;
use eframe::{egui, IconData};
use egui::{
Color32, ColorImage, Context, Image, ImageData, Label, RichText, SelectableLabel, Sense,
@ -39,12 +41,10 @@ use egui::{
};
#[cfg(feature = "video-ffmpeg")]
use egui_video::{AudioDevice, Player};
#[cfg(feature = "video-ffmpeg")]
use std::rc::Rc;
#[cfg(feature = "video-ffmpeg")]
use core::cell::RefCell;
use nostr_types::{Id, IdHex, Metadata, PublicKey, PublicKeyHex, RelayUrl, UncheckedUrl, Url};
use std::collections::{HashMap, HashSet};
#[cfg(feature = "video-ffmpeg")]
use std::rc::Rc;
use std::sync::atomic::Ordering;
use std::time::{Duration, Instant};
use zeroize::Zeroize;
@ -805,7 +805,11 @@ impl GossipUi {
}
#[cfg(feature = "video-ffmpeg")]
pub fn try_get_player(&mut self, ctx: &Context, url: Url) -> Option<Rc<RefCell<egui_video::Player>>> {
pub fn try_get_player(
&mut self,
ctx: &Context,
url: Url,
) -> Option<Rc<RefCell<egui_video::Player>>> {
// Do not keep retrying if failed
if GLOBALS.media.has_failed(&url.to_unchecked_url()) {
return None;
@ -820,7 +824,7 @@ impl GossipUi {
if let Ok(player) = Player::new_from_bytes(ctx, &bytes) {
if let Some(audio) = &mut self.audio_device {
if let Ok(player) = player.with_audio(audio) {
let player_ref = Rc::new( RefCell::new( player ) );
let player_ref = Rc::new(RefCell::new(player));
self.video_players.insert(url.clone(), player_ref.clone());
Some(player_ref)
} else {
@ -828,7 +832,7 @@ impl GossipUi {
None
}
} else {
let player_ref = Rc::new( RefCell::new( player ) );
let player_ref = Rc::new(RefCell::new(player));
self.video_players.insert(url.clone(), player_ref.clone());
Some(player_ref)
}