github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

wallet/chatview: realtime editing of timestamp_width

Browse Source
This commit is contained in:
darkfi
2024-09-23 17:27:48 +02:00
parent f1f41d46ba
commit cfa5a7461a
3 changed files with 111 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/darkwallet/src/app/schema.rs
View File

@@ -59,6 +59,16 @@ const EDITCHAT_HEIGHT: f32 = 163.;
#[cfg(target_os = "linux")]
const EDITCHAT_HEIGHT: f32 = 50.;
#[cfg(target_os = "android")]
const EDITCHAT_CURSOR_ASCENT: f32 = 80.;
#[cfg(target_os = "linux")]
const EDITCHAT_CURSOR_ASCENT: f32 = 25.;
#[cfg(target_os = "android")]
const EDITCHAT_CURSOR_DESCENT: f32 = 30.;
#[cfg(target_os = "linux")]
const EDITCHAT_CURSOR_DESCENT: f32 = 8.;
#[cfg(target_os = "android")]
const TEXTBAR_BASELINE: f32 = 93.;
#[cfg(target_os = "linux")]
@@ -90,7 +100,7 @@ const TIMESTAMP_FONTSIZE: f32 = 30.;
const TIMESTAMP_FONTSIZE: f32 = 12.;
#[cfg(target_os = "android")]
const TIMESTAMP_WIDTH: f32 = 80.;
const TIMESTAMP_WIDTH: f32 = 120.;
#[cfg(target_os = "linux")]
const TIMESTAMP_WIDTH: f32 = 60.;
@@ -759,8 +769,8 @@ pub(super) async fn make(app: &App, window: SceneNodePtr) {
prop.set_f32(Role::App, 1, 0.627).unwrap();
prop.set_f32(Role::App, 2, 1.).unwrap();
prop.set_f32(Role::App, 3, 1.).unwrap();
node.set_property_f32(Role::App, "cursor_ascent", 25.).unwrap();
node.set_property_f32(Role::App, "cursor_descent", 8.).unwrap();
node.set_property_f32(Role::App, "cursor_ascent", EDITCHAT_CURSOR_ASCENT).unwrap();
node.set_property_f32(Role::App, "cursor_descent", EDITCHAT_CURSOR_DESCENT).unwrap();
let prop = node.get_property("hi_bg_color").unwrap();
if LIGHTMODE {
prop.set_f32(Role::App, 0, 0.5).unwrap();

24
bin/darkwallet/src/ui/chatview/mod.rs
View File

@@ -266,11 +266,18 @@ impl ChatView {
}
on_modify.when_change(scroll.prop(), reload_view);
//async fn redraw(self_: Arc<ChatView>) {
// self_.redraw().await;
//}
//on_modify.when_change(rect.clone(), redraw);
//on_modify.when_change(debug.prop(), redraw);
async fn redraw(self_: Arc<ChatView>) {
self_.redraw_all().await;
}
on_modify.when_change(font_size.prop(), redraw);
on_modify.when_change(timestamp_font_size.prop(), redraw);
on_modify.when_change(timestamp_color.prop(), redraw);
on_modify.when_change(timestamp_width.prop(), redraw);
on_modify.when_change(text_color.prop(), redraw);
on_modify.when_change(nick_colors.clone(), redraw);
on_modify.when_change(hi_bg_color.prop(), redraw);
on_modify.when_change(rect.prop(), redraw);
on_modify.when_change(debug.prop(), redraw);
let mut tasks = vec![insert_line_method_task, motion_task, bgload_task];
tasks.append(&mut on_modify.tasks);
@@ -669,8 +676,11 @@ impl ChatView {
/// Invalidates cache and redraws everything
async fn redraw_all(&self) {
debug!(target: "ui::chatview", "redraw()");
// ... todo fin
debug!(target: "ui::chatview", "redraw_all()");
let mut msgbuf = self.msgbuf.lock().await;
msgbuf.adjust_params().await;
msgbuf.clear_meshes();
self.redraw_cached(&mut msgbuf).await;
}
}

104
bin/darkwallet/src/ui/chatview/page.rs
View File

@@ -28,7 +28,7 @@ use std::{
sync::{atomic::Ordering, Arc, Mutex as SyncMutex, Weak},
};
use super::{MessageId, Timestamp};
use super::{max, MessageId, Timestamp};
use crate::{
gfx::{
GfxBufferId, GfxDrawCall, GfxDrawInstruction, GfxDrawMesh, GfxTextureId,
@@ -54,7 +54,6 @@ fn is_whitespace(s: &str) -> bool {
pub struct PrivMessage {
font_size: f32,
timestamp_font_size: f32,
timestamp_width: f32,
window_scale: f32,
timestamp: Timestamp,
@@ -76,7 +75,6 @@ impl PrivMessage {
pub async fn new(
font_size: f32,
timestamp_font_size: f32,
timestamp_width: f32,
window_scale: f32,
timestamp: Timestamp,
@@ -85,6 +83,7 @@ impl PrivMessage {
text: String,
line_width: f32,
timestamp_width: f32,
text_shaper: &TextShaper,
render_api: &RenderApi,
@@ -103,7 +102,6 @@ impl PrivMessage {
let mut self_ = Self {
font_size,
timestamp_font_size,
timestamp_width,
window_scale,
timestamp,
id,
@@ -116,7 +114,7 @@ impl PrivMessage {
atlas,
mesh_cache: None,
};
self_.adjust_width(line_width);
self_.adjust_width(line_width, timestamp_width);
Message::Priv(self_)
}
@@ -135,6 +133,7 @@ impl PrivMessage {
clip: &Rectangle,
line_height: f32,
baseline: f32,
timestamp_width: f32,
nick_colors: &[Color],
timestamp_color: Color,
text_color: Color,
@@ -157,8 +156,8 @@ impl PrivMessage {
);
}
let mut off_x = self.timestamp_width;
self.render_timestamp(&mut mesh, baseline, timestamp_color);
let off_x = timestamp_width;
let nick_color = select_nick_color(&self.nick, nick_colors);
@@ -263,34 +262,48 @@ impl PrivMessage {
}
/// clear_mesh() must be called after this.
async fn adjust_window_scale(
async fn adjust_params(
&mut self,
font_size: f32,
timestamp_font_size: f32,
window_scale: f32,
line_width: f32,
timestamp_width: f32,
text_shaper: &TextShaper,
render_api: &RenderApi,
) -> GfxTextureId {
self.font_size = font_size;
self.timestamp_font_size = timestamp_font_size;
self.window_scale = window_scale;
let timestr = Self::gen_timestr(self.timestamp);
self.time_glyphs = text_shaper.shape(timestr, self.timestamp_font_size, window_scale).await;
self.time_glyphs = text_shaper.shape(timestr, timestamp_font_size, window_scale).await;
let linetext = format!("{} {}", self.nick, self.text);
self.unwrapped_glyphs = text_shaper.shape(linetext, self.font_size, window_scale).await;
self.unwrapped_glyphs = text_shaper.shape(linetext, font_size, window_scale).await;
let texture_id = self.atlas.texture_id;
let mut atlas = text::Atlas::new(render_api);
atlas.push(&self.time_glyphs);
atlas.push(&self.unwrapped_glyphs);
self.atlas = atlas.make();
// We need to rewrap the glyphs since they've been reloaded
self.adjust_width(line_width, timestamp_width);
texture_id
}
/// clear_mesh() must be called after this.
fn adjust_width(&mut self, line_width: f32) {
fn adjust_width(&mut self, line_width: f32, timestamp_width: f32) {
let width = line_width - timestamp_width;
// clamp to > 0
let width = max(width, 0.);
// Invalidate wrapped_glyphs and recalc
self.wrapped_lines =
text::wrap(line_width, self.font_size, self.window_scale, &self.unwrapped_glyphs);
text::wrap(width, self.font_size, self.window_scale, &self.unwrapped_glyphs);
}
fn clear_mesh(&mut self) -> Option<GfxDrawMesh> {
@@ -359,16 +372,18 @@ impl DateMessage {
}
/// clear_mesh() must be called after this.
async fn adjust_window_scale(
async fn adjust_params(
&mut self,
font_size: f32,
window_scale: f32,
text_shaper: &TextShaper,
render_api: &RenderApi,
) -> GfxTextureId {
self.font_size = font_size;
self.window_scale = window_scale;
let datestr = Self::datestr(self.timestamp);
self.glyphs = text_shaper.shape(datestr, self.font_size, window_scale).await;
self.glyphs = text_shaper.shape(datestr, font_size, window_scale).await;
let texture_id = self.atlas.texture_id;
@@ -452,21 +467,38 @@ impl Message {
}
}
async fn adjust_window_scale(
async fn adjust_params(
&mut self,
font_size: f32,
timestamp_font_size: f32,
window_scale: f32,
line_width: f32,
timestamp_width: f32,
text_shaper: &TextShaper,
render_api: &RenderApi,
) -> GfxTextureId {
match self {
Self::Priv(m) => m.adjust_window_scale(window_scale, text_shaper, render_api).await,
Self::Date(m) => m.adjust_window_scale(window_scale, text_shaper, render_api).await,
Self::Priv(m) => {
m.adjust_params(
font_size,
timestamp_font_size,
window_scale,
line_width,
timestamp_width,
text_shaper,
render_api,
)
.await
}
Self::Date(m) => {
m.adjust_params(font_size, window_scale, text_shaper, render_api).await
}
}
}
fn adjust_width(&mut self, line_width: f32) {
fn adjust_width(&mut self, line_width: f32, timestamp_width: f32) {
match self {
Self::Priv(m) => m.adjust_width(line_width),
Self::Priv(m) => m.adjust_width(line_width, timestamp_width),
Self::Date(_) => {}
}
}
@@ -483,6 +515,7 @@ impl Message {
clip: &Rectangle,
line_height: f32,
baseline: f32,
timestamp_width: f32,
nick_colors: &[Color],
timestamp_color: Color,
text_color: Color,
@@ -495,6 +528,7 @@ impl Message {
clip,
line_height,
baseline,
timestamp_width,
nick_colors,
timestamp_color,
text_color,
@@ -506,6 +540,7 @@ impl Message {
clip,
line_height,
baseline,
// No timestamp_width
nick_colors,
timestamp_color,
text_color,
@@ -614,9 +649,28 @@ impl MessageBuffer {
return
}
self.adjust_params().await;
}
/// This will force a reload of everything
pub async fn adjust_params(&mut self) {
let window_scale = self.window_scale.get();
let font_size = self.font_size.get();
let timestamp_font_size = self.timestamp_font_size.get();
let timestamp_width = self.timestamp_width.get();
for msg in &mut self.msgs {
let old_texture_id =
msg.adjust_window_scale(window_scale, &self.text_shaper, &self.render_api).await;
let old_texture_id = msg
.adjust_params(
font_size,
timestamp_font_size,
window_scale,
self.line_width,
timestamp_width,
&self.text_shaper,
&self.render_api,
)
.await;
self.freed.add_texture(old_texture_id);
}
}
@@ -629,8 +683,10 @@ impl MessageBuffer {
}
self.line_width = line_width;
let timestamp_width = self.timestamp_width.get();
for msg in &mut self.msgs {
msg.adjust_width(line_width);
msg.adjust_width(line_width, timestamp_width);
}
}
@@ -673,13 +729,13 @@ impl MessageBuffer {
let msg = PrivMessage::new(
font_size,
timestamp_font_size,
timestamp_width,
window_scale,
timest,
msg_id,
nick,
text,
self.line_width,
timestamp_width,
&self.text_shaper,
&self.render_api,
)
@@ -734,13 +790,13 @@ impl MessageBuffer {
let msg = PrivMessage::new(
font_size,
timestamp_font_size,
timestamp_width,
window_scale,
timest,
msg_id,
nick,
text,
self.line_width,
timestamp_width,
&self.text_shaper,
&self.render_api,
)
@@ -761,6 +817,7 @@ impl MessageBuffer {
pub async fn gen_meshes(&mut self, rect: &Rectangle, scroll: f32) -> Vec<(f32, GfxDrawMesh)> {
let line_height = self.line_height.get();
let baseline = self.baseline.get();
let timestamp_width = self.timestamp_width.get();
let debug_render = self.debug.get();
let timest_color = self.timestamp_color.get();
@@ -792,6 +849,7 @@ impl MessageBuffer {
rect,
line_height,
baseline,
timestamp_width,
&nick_colors,
timest_color,
text_color,