move get first router to Columns
Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
@@ -63,6 +63,18 @@ impl Columns {
|
|||||||
self.columns.push(Column::new(vec![Route::AddColumn]));
|
self.columns.push(Column::new(vec![Route::AddColumn]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get the first router in the columns if there are columns present.
|
||||||
|
// Otherwise, create a new column picker and return the router
|
||||||
|
pub fn get_first_router(&mut self) -> &mut Router<Route> {
|
||||||
|
if self.columns.is_empty() {
|
||||||
|
self.new_column_picker();
|
||||||
|
}
|
||||||
|
self.columns
|
||||||
|
.get_mut(0)
|
||||||
|
.expect("There should be at least one column")
|
||||||
|
.router_mut()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn columns_mut(&mut self) -> &mut Vec<Column> {
|
pub fn columns_mut(&mut self) -> &mut Vec<Column> {
|
||||||
&mut self.columns
|
&mut self.columns
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use crate::{
|
|||||||
colors,
|
colors,
|
||||||
column::{Column, Columns},
|
column::{Column, Columns},
|
||||||
imgcache::ImageCache,
|
imgcache::ImageCache,
|
||||||
route::{Route, Router},
|
route::Route,
|
||||||
user_account::UserAccount,
|
user_account::UserAccount,
|
||||||
Damus,
|
Damus,
|
||||||
};
|
};
|
||||||
@@ -163,7 +163,7 @@ impl<'a> DesktopSidePanel<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn perform_action(columns: &mut Columns, action: SidePanelAction) {
|
pub fn perform_action(columns: &mut Columns, action: SidePanelAction) {
|
||||||
let router = get_first_router(columns);
|
let router = columns.get_first_router();
|
||||||
match action {
|
match action {
|
||||||
SidePanelAction::Panel => {} // TODO
|
SidePanelAction::Panel => {} // TODO
|
||||||
SidePanelAction::Account => {
|
SidePanelAction::Account => {
|
||||||
@@ -234,17 +234,6 @@ fn settings_button(dark_mode: bool) -> impl Widget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_first_router(columns: &mut Columns) -> &mut Router<Route> {
|
|
||||||
if columns.columns().is_empty() {
|
|
||||||
columns.new_column_picker();
|
|
||||||
}
|
|
||||||
columns
|
|
||||||
.columns_mut()
|
|
||||||
.get_mut(0)
|
|
||||||
.expect("There should be at least one column")
|
|
||||||
.router_mut()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn add_column_button(dark_mode: bool) -> impl Widget {
|
fn add_column_button(dark_mode: bool) -> impl Widget {
|
||||||
let _ = dark_mode;
|
let _ = dark_mode;
|
||||||
move |ui: &mut egui::Ui| {
|
move |ui: &mut egui::Ui| {
|
||||||
|
|||||||
Reference in New Issue
Block a user