mirror of
https://github.com/aljazceru/notedeck.git
synced 2026-01-13 21:34:20 +01:00
column: use simplified column string titles for now
even though we will replace this soon, it is still technically more correct than Timeline(1), etc
This commit is contained in:
@@ -249,7 +249,7 @@ pub fn render_nav(col: usize, app: &mut Damus, ui: &mut egui::Ui) -> RenderNavRe
|
||||
.returning(app.columns_mut().column_mut(col).router_mut().returning)
|
||||
.id_source(egui::Id::new(col_id))
|
||||
.show_mut(ui, |ui, render_type, nav| match render_type {
|
||||
NavUiType::Title => NavTitle::new(nav.routes_arr()).show(ui),
|
||||
NavUiType::Title => NavTitle::new(&app.columns, nav.routes_arr()).show(ui),
|
||||
NavUiType::Body => render_nav_body(ui, app, nav.routes().last().expect("top"), col),
|
||||
});
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
use crate::{
|
||||
app_style::{get_font_size, NotedeckTextStyle},
|
||||
column::Columns,
|
||||
fonts::NamedFontFamily,
|
||||
nav::RenderNavAction,
|
||||
route::Route,
|
||||
@@ -9,12 +10,13 @@ use crate::{
|
||||
use egui::{pos2, Color32, Stroke};
|
||||
|
||||
pub struct NavTitle<'a> {
|
||||
columns: &'a Columns,
|
||||
routes: &'a [Route],
|
||||
}
|
||||
|
||||
impl<'a> NavTitle<'a> {
|
||||
pub fn new(routes: &'a [Route]) -> Self {
|
||||
NavTitle { routes }
|
||||
pub fn new(columns: &'a Columns, routes: &'a [Route]) -> Self {
|
||||
NavTitle { columns, routes }
|
||||
}
|
||||
|
||||
pub fn show(&mut self, ui: &mut egui::Ui) -> Option<RenderNavAction> {
|
||||
@@ -177,7 +179,7 @@ impl<'a> NavTitle<'a> {
|
||||
|
||||
let title_galley = ui.fonts(|f| {
|
||||
f.layout(
|
||||
top.to_string(),
|
||||
top.title(self.columns).to_string(),
|
||||
font,
|
||||
ui.visuals().text_color(),
|
||||
max_title_width,
|
||||
|
||||
Reference in New Issue
Block a user