tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix inline note preview colors

Browse Source 
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-06-11 16:10:18 -07:00
parent afb375356b
commit bff0f3f628
4 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/colors.rs
View File

@@ -66,8 +66,8 @@ pub fn desktop_dark_color_theme() -> ColorTheme {
// NONINTERACTIVE WIDGET // NONINTERACTIVE WIDGET
noninteractive_bg_fill: DARK_ISH_BG, noninteractive_bg_fill: DARK_ISH_BG,
noninteractive_weak_bg_fill: SEMI_DARKER_BG, noninteractive_weak_bg_fill: DARK_BG,
noninteractive_bg_stroke_color: DARK_BG, noninteractive_bg_stroke_color: SEMI_DARKER_BG,
noninteractive_fg_stroke_color: GRAY_SECONDARY, noninteractive_fg_stroke_color: GRAY_SECONDARY,
// INACTIVE WIDGET // INACTIVE WIDGET

5
src/timeline.rs
View File

@@ -296,9 +296,10 @@ pub fn timeline_view(ui: &mut egui::Ui, app: &mut Damus, timeline: usize) {
return 0; return 0;
}; };
ui::padding(8.0, ui, |ui| {
let textmode = app.textmode; let textmode = app.textmode;
let note_ui = ui::Note::new(app, &note).note_previews(!textmode); ui.add(ui::Note::new(app, &note).note_previews(!textmode));
ui.add(note_ui); });
ui::hline(ui); ui::hline(ui);
//ui.add(egui::Separator::default().spacing(0.0)); //ui.add(egui::Separator::default().spacing(0.0));

7
src/ui/note/contents.rs
View File

@@ -80,12 +80,13 @@ fn render_note_preview(
}; };
egui::Frame::none() egui::Frame::none()
//.fill(egui::Color32::BLACK.gamma_multiply(0.2)) .fill(ui.visuals().noninteractive().bg_fill)
// .inner_margin(egui::Margin::same(8.0))
.outer_margin(egui::Margin::symmetric(0.0, 8.0))
.rounding(egui::Rounding::same(10.0)) .rounding(egui::Rounding::same(10.0))
.stroke(egui::Stroke::new( .stroke(egui::Stroke::new(
1.0, 1.0,
egui::Color32::from_rgb(0x2C, 0x2C, 0x2C), ui.visuals().noninteractive().bg_stroke.color,
)) ))
.show(ui, |ui| { .show(ui, |ui| {
ui.add( ui.add(

2
src/ui/note/mod.rs
View File

@@ -192,7 +192,6 @@ impl<'a> Note<'a> {
let note_key = self.note.key().expect("todo: support non-db notes"); let note_key = self.note.key().expect("todo: support non-db notes");
let txn = self.note.txn().expect("todo: support non-db notes"); let txn = self.note.txn().expect("todo: support non-db notes");
crate::ui::padding(12.0, ui, |ui| {
ui.with_layout(egui::Layout::left_to_right(egui::Align::TOP), |ui| { ui.with_layout(egui::Layout::left_to_right(egui::Align::TOP), |ui| {
ui.spacing_mut().item_spacing.x = 16.0; ui.spacing_mut().item_spacing.x = 16.0;
@@ -278,7 +277,6 @@ impl<'a> Note<'a> {
render_note_actionbar(ui); render_note_actionbar(ui);
} }
}); });
});
}) })
.response .response
} }