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

fix some rebase issues

Browse Source 
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-09-11 16:24:43 -07:00
parent 7fa7529a1d
commit 37fbde1566
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -1148,7 +1148,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_nav" name = "egui_nav"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/damus-io/egui-nav?branch=egui-0.28#b19742503329a13df660ac8c5a3ada4a25b7cc53" source = "git+https://github.com/damus-io/egui-nav?rev=b19742503329a13df660ac8c5a3ada4a25b7cc53#b19742503329a13df660ac8c5a3ada4a25b7cc53"
dependencies = [ dependencies = [
"egui", "egui",
"egui_extras", "egui_extras",

4
src/ui/account_management.rs
View File

@@ -225,13 +225,13 @@ mod preview {
ui.add_space(24.0); ui.add_space(24.0);
if let Some(response) = AccountManagementView::ui( if let Some(response) = AccountManagementView::ui(
ui, ui,
&self.app.account_manager, &self.app.accounts,
&self.app.ndb, &self.app.ndb,
&mut self.app.img_cache, &mut self.app.img_cache,
) )
.inner .inner
{ {
process_management_view_response_stateless(&mut self.app.account_manager, response) process_management_view_response_stateless(&mut self.app.accounts, response)
} }
} }
} }

2
src/ui/stateful_account_management.rs
View File

@@ -112,7 +112,7 @@ mod preview {
StatefulAccountManagementView::show( StatefulAccountManagementView::show(
ui, ui,
&mut self.app.account_management_view_state, &mut self.app.account_management_view_state,
&mut self.app.account_manager, &mut self.app.accounts,
&mut self.app.img_cache, &mut self.app.img_cache,
&mut self.app.login_state, &mut self.app.login_state,
&self.app.ndb, &self.app.ndb,