From 748d9d2358fedd35a65986d005ed99a13a805ad9 Mon Sep 17 00:00:00 2001
From: kernelkind <kernelkind@gmail.com>
Date: Wed, 22 May 2024 15:32:58 -0400
Subject: [PATCH] Integrate global popup into app

Signed-off-by: kernelkind <kernelkind@gmail.com>
---
 src/app.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app.rs b/src/app.rs
index 61507c1a..30770e5c 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -7,7 +7,7 @@ use crate::imgcache::ImageCache;
 use crate::notecache::{CachedNote, NoteCache};
 use crate::timeline;
 use crate::timeline::{NoteRef, Timeline, ViewFilter};
-use crate::ui::is_mobile;
+use crate::ui::{is_mobile, DesktopGlobalPopup, DesktopSidePanel, View};
 use crate::Result;
 
 use egui::{Context, Frame, Style};
@@ -838,7 +838,11 @@ fn render_damus_desktop(ctx: &egui::Context, app: &mut Damus) {
     };
 
     if app.timelines.len() == 1 {
+        DesktopSidePanel::panel().show(ctx, |ui| {
+            DesktopSidePanel::inner(ui);
+        });
         main_panel(&ctx.style()).show(ctx, |ui| {
+            DesktopGlobalPopup::new(app).ui(ui);
             timeline::timeline_view(ui, app, 0);
         });
 
@@ -847,6 +851,7 @@ fn render_damus_desktop(ctx: &egui::Context, app: &mut Damus) {
 
     main_panel(&ctx.style()).show(ctx, |ui| {
         ui.spacing_mut().item_spacing.x = 0.0;
+        DesktopGlobalPopup::new(app).ui(ui);
         if need_scroll {
             egui::ScrollArea::horizontal().show(ui, |ui| {
                 timelines_view(ui, panel_sizes, app, app.timelines.len());