notedeck

commit 1228f83e5006794825a03e1142013943eccf3998
parent b14a2bf254d90f57f678eb84f1f5d08e57f0180e
Author: William Casarin <jb55@jb55.com>
Date:   Mon, 24 Jun 2024 17:11:01 -0700

refactor: move fixed_window to ui

This is a ui module

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
src/lib.rs
 | 
1
-
R
src/fixed_window.rs -> src/ui/fixed_window.rs
 | 
0

M
src/ui/global_popup.rs
 | 
10
+++-------
M
src/ui/mod.rs
 | 
2
++

4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/lib.rs b/src/lib.rs
@@ -10,7 +10,6 @@ mod app_style;
 mod colors;
 mod draft;
 mod filter;
-mod fixed_window;
 mod fonts;
 mod frame_history;
 mod images;
diff --git a/src/fixed_window.rs b/src/ui/fixed_window.rs
diff --git a/src/ui/global_popup.rs b/src/ui/global_popup.rs
@@ -3,11 +3,7 @@ use std::{cell::RefCell, rc::Rc};
 use egui::Sense;
 use egui_nav::{Nav, NavAction};
 
-use crate::{
-    fixed_window::{FixedWindow, FixedWindowResponse},
-    route::Route,
-    Damus,
-};
+use crate::{route::Route, ui, Damus};
 
 static MARGIN: f32 = 200.0;
 
@@ -25,7 +21,7 @@ impl DesktopGlobalPopup {
 
         let app_ctx = Rc::new(RefCell::new(app));
 
-        let resp = FixedWindow::maybe_with_title(title).show(ui, rect, |ui| {
+        let resp = ui::FixedWindow::maybe_with_title(title).show(ui, rect, |ui| {
             let nav_response =
                 Nav::new(routes)
                     .title(false)
@@ -49,7 +45,7 @@ impl DesktopGlobalPopup {
 
         let mut app = app_ctx.borrow_mut();
 
-        if resp == FixedWindowResponse::Closed {
+        if resp == ui::FixedWindowResponse::Closed {
             app.global_nav.pop();
             app.show_global_popup = false;
         }
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
@@ -2,6 +2,7 @@ pub mod account_login_view;
 pub mod account_management;
 pub mod account_switcher;
 pub mod anim;
+pub mod fixed_window;
 pub mod global_popup;
 pub mod mention;
 pub mod note;
@@ -13,6 +14,7 @@ pub mod username;
 
 pub use account_management::AccountManagementView;
 pub use account_switcher::AccountSelectionWidget;
+pub use fixed_window::{FixedWindow, FixedWindowResponse};
 pub use global_popup::DesktopGlobalPopup;
 pub use mention::Mention;
 pub use note::{BarAction, Note, NoteResponse, PostView};