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

Review theme background fills

Browse Source
This commit is contained in:
Daniele Tonon 2023-10-24 17:51:41 +02:00
parent f7bb01a7d6
commit 8ab9e0e36e
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gossip-bin/src/ui/mod.rs
View File

@ -1089,9 +1089,9 @@ impl eframe::App for GossipUi {
match self.page {
Page::PeopleList | Page::PeopleFollow | Page::PeopleMuted | Page::Person(_) => {
if self.theme.dark_mode {
egui::Color32::BLACK
ctx.style().visuals.panel_fill
} else {
egui::Color32::WHITE
self.theme.main_content_bgcolor()
}
}
_ => {ctx.style().visuals.panel_fill}

32
gossip-bin/src/ui/theme/default.rs
View File

@ -33,6 +33,20 @@ impl ThemeDef for DefaultTheme {
Color32::from_rgb( 0xFF, 0x5E, 0x57 )
}
fn main_content_bgcolor(dark_mode: bool) -> Color32 {
if dark_mode {
let mut hsva: ecolor::HsvaGamma = Self::accent_color(dark_mode).into();
hsva.s = 0.0;
hsva.v = 0.12;
hsva.into()
} else {
let mut hsva: ecolor::HsvaGamma = Self::highlighted_note_bgcolor(dark_mode).into();
hsva.s = 0.0;
hsva.v = 1.0;
hsva.into()
}
}
fn highlighted_note_bgcolor(dark_mode: bool) -> Color32 {
if dark_mode {
Color32::from_rgb(41, 34, 46)
@ -156,9 +170,9 @@ impl ThemeDef for DefaultTheme {
},
// Background colors
window_fill: Color32::from_gray(0x1F), // pulldown menus and tooltips
panel_fill: Color32::from_gray(0x18), // panel backgrounds, even-table-rows
faint_bg_color: Color32::from_gray(24), // odd-table-rows
window_fill: Color32::from_gray(31), // pulldown menus and tooltips
panel_fill: Color32::from_gray(24), // panel backgrounds, even-table-rows
faint_bg_color: Color32::from_gray(20), // odd-table-rows
extreme_bg_color: Color32::from_gray(45), // text input background; scrollbar background
code_bg_color: Color32::from_gray(64), // ???
@ -667,17 +681,7 @@ impl ThemeDef for DefaultTheme {
Self::highlighted_note_bgcolor(false)
}
} else {
if dark_mode {
let mut hsva: ecolor::HsvaGamma = Self::accent_color(dark_mode).into();
hsva.s = 0.0;
hsva.v = 0.12;
hsva.into()
} else {
let mut hsva: ecolor::HsvaGamma = Self::highlighted_note_bgcolor(dark_mode).into();
hsva.s = 0.0;
hsva.v = 1.0;
hsva.into()
}
Self::main_content_bgcolor(dark_mode)
}
}
fn feed_frame_stroke(_dark_mode: bool, _post: &NoteRenderData) -> Stroke {

9
gossip-bin/src/ui/theme/mod.rs
View File

@ -93,6 +93,12 @@ macro_rules! theme_dispatch {
}
}
pub fn main_content_bgcolor(&self) -> Color32 {
match self.variant {
$( $variant => $class::main_content_bgcolor(self.dark_mode), )+
}
}
#[allow(dead_code)]
pub fn highlighted_note_bgcolor(&self) -> Color32 {
match self.variant {
@ -374,6 +380,8 @@ pub trait ThemeDef: Send + Sync {
fn danger_color(dark_mode: bool) -> Color32;
fn main_content_bgcolor(dark_mode: bool) -> Color32;
// Used as background for highlighting unread events
fn highlighted_note_bgcolor(dark_mode: bool) -> Color32;
@ -447,6 +455,7 @@ pub trait ThemeDef: Send + Sync {
hsva.v = original_value * (1.0 - factor); // Linear interpolation
hsva.into()
}
}
pub(super) fn font_definitions() -> FontDefinitions {