From 7f0c5b70fd8be8b4c30b8d10f4502f10346e231c Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Wed, 4 Oct 2023 13:23:29 +1300 Subject: [PATCH] cargo format --- src/media.rs | 5 +-- src/people.rs | 3 +- src/storage/migrations/mod.rs | 4 +-- src/storage/mod.rs | 8 +++-- src/ui/feed/note/mod.rs | 60 ++++++++++----------------------- src/ui/mod.rs | 30 ++++++++--------- src/ui/relays/mod.rs | 6 ++-- src/ui/wizard/import_keys.rs | 4 +-- src/ui/wizard/welcome_gossip.rs | 8 ++--- 9 files changed, 48 insertions(+), 80 deletions(-) diff --git a/src/media.rs b/src/media.rs index d3bfc8c0..9e0842ef 100644 --- a/src/media.rs +++ b/src/media.rs @@ -178,7 +178,8 @@ pub(crate) fn load_image_bytes( let opt = usvg::Options::default(); let rtree = usvg::Tree::from_data(image_bytes, &opt)?; let pixmap_size = rtree.size.to_int_size(); - let [w, h] = if force_resize || pixmap_size.width() > 16384 || pixmap_size.height() > 16384 { + let [w, h] = if force_resize || pixmap_size.width() > 16384 || pixmap_size.height() > 16384 + { [default_size, default_size] } else { [pixmap_size.width(), pixmap_size.height()] @@ -281,7 +282,7 @@ fn round_image(image: &mut RgbaImage) { } } else { // Outside of the avatar circle - *pixel = Rgba([0,0,0,0]); + *pixel = Rgba([0, 0, 0, 0]); } } } diff --git a/src/people.rs b/src/people.rs index 27863f7d..5a8c51b8 100644 --- a/src/people.rs +++ b/src/people.rs @@ -478,8 +478,7 @@ impl People { / 100; match crate::media::load_image_bytes( - &bytes, - true, // crop square + &bytes, true, // crop square size, // default size, true, // force to that size rounded, diff --git a/src/storage/migrations/mod.rs b/src/storage/migrations/mod.rs index 63d42942..36737913 100644 --- a/src/storage/migrations/mod.rs +++ b/src/storage/migrations/mod.rs @@ -498,7 +498,7 @@ impl Storage { const DEF: Theme1 = Theme1 { variant: ThemeVariant1::Default, dark_mode: false, - follow_os_dark_mode: true + follow_os_dark_mode: true, }; let theme = match self.general.get(txn, b"theme") { @@ -507,7 +507,7 @@ impl Storage { Ok(Some(bytes)) => match Theme1::read_from_buffer(bytes) { Ok(val) => val, Err(_) => DEF, - } + }, }; self.write_setting_theme_variant(&theme.variant.name().to_owned(), Some(txn))?; diff --git a/src/storage/mod.rs b/src/storage/mod.rs index 1e0eaf1e..8ab3bc63 100644 --- a/src/storage/mod.rs +++ b/src/storage/mod.rs @@ -726,7 +726,12 @@ impl Storage { u32, 8000 ); - def_setting!(theme_variant, b"theme_variant", String, "Default".to_owned()); + def_setting!( + theme_variant, + b"theme_variant", + String, + "Default".to_owned() + ); def_setting!(dark_mode, b"dark_mode", bool, false); def_setting!(follow_os_dark_mode, b"follow_os_dark_mode", bool, true); def_setting!(override_dpi, b"override_dpi", Option::, None); @@ -2044,7 +2049,6 @@ impl Storage { rw_txn: Option<&mut RwTxn<'a>>, ) -> Result<(), Error> { let f = |txn: &mut RwTxn<'a>| -> Result<(), Error> { - // Erase all indices first self.db_event_ek_pk_index()?.clear(txn)?; self.db_event_ek_c_index()?.clear(txn)?; diff --git a/src/ui/feed/note/mod.rs b/src/ui/feed/note/mod.rs index c0d1832f..020a6183 100644 --- a/src/ui/feed/note/mod.rs +++ b/src/ui/feed/note/mod.rs @@ -160,10 +160,7 @@ pub(super) fn render_note( } } - thin_separator( - ui, - app.theme.feed_post_separator_stroke(&render_data), - ); + thin_separator(ui, app.theme.feed_post_separator_stroke(&render_data)); } // even if muted, continue rendering thread children @@ -516,20 +513,17 @@ fn render_note_inner( .constrain(true) .show(ctx, |ui| { ui.set_min_width(200.0); - egui::Frame::popup(&app.theme.get_style()).show( - ui, - |ui| { - if let Ok(seen_on) = - GLOBALS.storage.get_event_seen_on_relay(note.event.id) - { - for (url, _) in seen_on.iter() { - ui.label(url.as_str()); - } - } else { - ui.label("unknown"); + egui::Frame::popup(&app.theme.get_style()).show(ui, |ui| { + if let Ok(seen_on) = + GLOBALS.storage.get_event_seen_on_relay(note.event.id) + { + for (url, _) in seen_on.iter() { + ui.label(url.as_str()); } - }, - ); + } else { + ui.label("unknown"); + } + }); }); } @@ -1079,19 +1073,9 @@ fn render_repost( .fill(app.theme.repost_fill(&render_data)) .stroke(app.theme.repost_stroke(&render_data)) .show(ui, |ui| { - ui.add_space( - app.theme - .repost_space_above_separator_before(&render_data), - ); - thin_separator( - ui, - app.theme - .repost_separator_before_stroke(&render_data), - ); - ui.add_space( - app.theme - .repost_space_below_separator_before(&render_data), - ); + ui.add_space(app.theme.repost_space_above_separator_before(&render_data)); + thin_separator(ui, app.theme.repost_separator_before_stroke(&render_data)); + ui.add_space(app.theme.repost_space_below_separator_before(&render_data)); ui.horizontal_wrapped(|ui| { let top = ui.next_widget_position(); @@ -1118,19 +1102,9 @@ fn render_repost( } } }); - ui.add_space( - app.theme - .repost_space_above_separator_after(&render_data), - ); - thin_separator( - ui, - app.theme - .repost_separator_after_stroke(&render_data), - ); - ui.add_space( - app.theme - .repost_space_below_separator_after(&render_data), - ); + ui.add_space(app.theme.repost_space_above_separator_after(&render_data)); + thin_separator(ui, app.theme.repost_separator_after_stroke(&render_data)); + ui.add_space(app.theme.repost_space_below_separator_after(&render_data)); }); }); diff --git a/src/ui/mod.rs b/src/ui/mod.rs index d24375a1..2e3f2b53 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,14 +1,12 @@ macro_rules! text_edit_line { ($app:ident, $var:expr) => { - egui::widgets::TextEdit::singleline(&mut $var) - .text_color($app.theme.input_text_color()) + egui::widgets::TextEdit::singleline(&mut $var).text_color($app.theme.input_text_color()) }; } macro_rules! text_edit_multiline { ($app:ident, $var:expr) => { - egui::widgets::TextEdit::multiline(&mut $var) - .text_color($app.theme.input_text_color()) + egui::widgets::TextEdit::multiline(&mut $var).text_color($app.theme.input_text_color()) }; } @@ -528,7 +526,7 @@ impl GossipUi { let bytes = include_bytes!("../../assets/option.svg"); let opt = usvg::Options { dpi: dpi as f32, - .. Default::default() + ..Default::default() }; let rtree = usvg::Tree::from_data(bytes, &opt).unwrap(); let [w, h] = [20_u32, 20_u32]; @@ -561,7 +559,9 @@ impl GossipUi { let sys_dark_mode = cctx.egui_ctx.style().visuals.dark_mode; if settings.dark_mode != sys_dark_mode { settings.dark_mode = sys_dark_mode; - let _ = GLOBALS.storage.write_setting_dark_mode(&sys_dark_mode, None); + let _ = GLOBALS + .storage + .write_setting_dark_mode(&sys_dark_mode, None); } } @@ -996,14 +996,12 @@ impl eframe::App for GossipUi { egui::TopBottomPanel::top("top-area") .frame( - egui::Frame::side_top_panel(&self.theme.get_style()).inner_margin( - egui::Margin { - left: 20.0, - right: 15.0, - top: 10.0, - bottom: 10.0, - }, - ), + egui::Frame::side_top_panel(&self.theme.get_style()).inner_margin(egui::Margin { + left: 20.0, + right: 15.0, + top: 10.0, + bottom: 10.0, + }), ) .resizable(true) .show_animated( @@ -1215,7 +1213,7 @@ impl GossipUi { } if let Some(rgba_image) = GLOBALS.people.get_avatar(pubkey, self.theme.round_image()) { - let current_size = [rgba_image.width() as usize,rgba_image.height() as usize]; + let current_size = [rgba_image.width() as usize, rgba_image.height() as usize]; let pixels = rgba_image.as_flat_samples(); let color_image = ColorImage::from_rgba_unmultiplied(current_size, pixels.as_slice()); let texture_handle = ctx.load_texture( @@ -1257,7 +1255,7 @@ impl GossipUi { } if let Some(rgba_image) = GLOBALS.media.get_image(&url) { - let current_size = [rgba_image.width() as usize,rgba_image.height() as usize]; + let current_size = [rgba_image.width() as usize, rgba_image.height() as usize]; let pixels = rgba_image.as_flat_samples(); let color_image = ColorImage::from_rgba_unmultiplied(current_size, pixels.as_slice()); let texture_handle = ctx.load_texture( diff --git a/src/ui/relays/mod.rs b/src/ui/relays/mod.rs index 3e1361b9..e2ff20b0 100644 --- a/src/ui/relays/mod.rs +++ b/src/ui/relays/mod.rs @@ -357,8 +357,7 @@ fn entry_dialog_step1(ui: &mut Ui, app: &mut GossipUi) { ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| { ui.visuals_mut().widgets.inactive.weak_bg_fill = app.theme.accent_color(); ui.visuals_mut().widgets.hovered.weak_bg_fill = { - let mut hsva: egui::ecolor::HsvaGamma = - app.theme.accent_color().into(); + let mut hsva: egui::ecolor::HsvaGamma = app.theme.accent_color().into(); hsva.v *= 0.8; hsva.into() }; @@ -417,8 +416,7 @@ fn entry_dialog_step2(ui: &mut Ui, app: &mut GossipUi) { ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| { ui.visuals_mut().widgets.inactive.weak_bg_fill = app.theme.accent_color(); ui.visuals_mut().widgets.hovered.weak_bg_fill = { - let mut hsva: egui::ecolor::HsvaGamma = - app.theme.accent_color().into(); + let mut hsva: egui::ecolor::HsvaGamma = app.theme.accent_color().into(); hsva.v *= 0.8; hsva.into() }; diff --git a/src/ui/wizard/import_keys.rs b/src/ui/wizard/import_keys.rs index 4c88b426..d98a6ff3 100644 --- a/src/ui/wizard/import_keys.rs +++ b/src/ui/wizard/import_keys.rs @@ -19,9 +19,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr ui.add_space(20.0); if ui - .button( - RichText::new(" > Import a Public Key only").color(app.theme.accent_color()), - ) + .button(RichText::new(" > Import a Public Key only").color(app.theme.accent_color())) .clicked() { app.page = Page::Wizard(WizardPage::ImportPublicKey); diff --git a/src/ui/wizard/welcome_gossip.rs b/src/ui/wizard/welcome_gossip.rs index 32789d06..76b3091a 100644 --- a/src/ui/wizard/welcome_gossip.rs +++ b/src/ui/wizard/welcome_gossip.rs @@ -18,10 +18,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr ui.add_space(20.0); if ui - .button( - RichText::new(" > Create a New Nostr Account") - .color(app.theme.accent_color()), - ) + .button(RichText::new(" > Create a New Nostr Account").color(app.theme.accent_color())) .clicked() { app.wizard_state.new_user = true; @@ -31,8 +28,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr ui.add_space(20.0); if ui .button( - RichText::new(" > I Already have a Nostr Account") - .color(app.theme.accent_color()), + RichText::new(" > I Already have a Nostr Account").color(app.theme.accent_color()), ) .clicked() {