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

remove context from DesktopSidePanel

Browse Source 
we can just get this from the egui::Ui when rendering

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-05-18 10:57:28 -07:00
parent fd943e5f9f
commit 66ce42a302
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/global_popup.rs
View File

@@ -120,7 +120,7 @@ mod preview {
impl View for GlobalPopupPreview { impl View for GlobalPopupPreview {
fn ui(&mut self, ui: &mut egui::Ui) { fn ui(&mut self, ui: &mut egui::Ui) {
let mut panel = DesktopSidePanel::new(ui.ctx()); let mut panel = DesktopSidePanel::new();
DesktopSidePanel::panel().show(ui.ctx(), |ui| panel.ui(ui)); DesktopSidePanel::panel().show(ui.ctx(), |ui| panel.ui(ui));
DesktopGlobalPopup::new(&mut self.app).ui(ui); DesktopGlobalPopup::new(&mut self.app).ui(ui);
} }

25
src/ui/side_panel.rs
View File

@@ -7,24 +7,23 @@ use super::{
View, View,
}; };
pub struct DesktopSidePanel<'a> { #[derive(Default)]
ctx: &'a egui::Context, pub struct DesktopSidePanel {}
}
static ID: &str = "left panel"; static ID: &str = "left panel";
impl<'a> View for DesktopSidePanel<'a> { impl View for DesktopSidePanel {
fn ui(&mut self, ui: &mut egui::Ui) { fn ui(&mut self, ui: &mut egui::Ui) {
DesktopSidePanel::inner(self.ctx, ui); DesktopSidePanel::inner(ui);
} }
} }
impl<'a> DesktopSidePanel<'a> { impl DesktopSidePanel {
pub fn new(ctx: &'a egui::Context) -> Self { pub fn new() -> Self {
DesktopSidePanel { ctx } DesktopSidePanel::default()
} }
pub fn inner(ctx: &egui::Context, ui: &mut egui::Ui) { pub fn inner(ui: &mut egui::Ui) {
let dark_mode = ui.ctx().style().visuals.dark_mode; let dark_mode = ui.ctx().style().visuals.dark_mode;
let spacing_amt = 16.0; let spacing_amt = 16.0;
ui.with_layout(Layout::bottom_up(egui::Align::Center), |ui| { ui.with_layout(Layout::bottom_up(egui::Align::Center), |ui| {
@@ -33,8 +32,8 @@ impl<'a> DesktopSidePanel<'a> {
.add_sized(Vec2::new(32.0, 32.0), Button::new("A")) .add_sized(Vec2::new(32.0, 32.0), Button::new("A"))
.clicked() .clicked()
{ {
PERSISTED_SIDE_PANEL.set_state(ctx, Some(GlobalPopupType::AccountManagement)); PERSISTED_SIDE_PANEL.set_state(ui.ctx(), Some(GlobalPopupType::AccountManagement));
PERSISTED_GLOBAL_POPUP.set_state(ctx, true); PERSISTED_GLOBAL_POPUP.set_state(ui.ctx(), true);
} }
ui.add_space(spacing_amt); ui.add_space(spacing_amt);
ui.add(settings_button(dark_mode)); ui.add(settings_button(dark_mode));
@@ -78,12 +77,12 @@ mod preview {
impl View for DesktopSidePanelPreview { impl View for DesktopSidePanelPreview {
fn ui(&mut self, ui: &mut egui::Ui) { fn ui(&mut self, ui: &mut egui::Ui) {
let mut panel = DesktopSidePanel::new(ui.ctx()); let mut panel = DesktopSidePanel::new();
DesktopSidePanel::panel().show(ui.ctx(), |ui| panel.ui(ui)); DesktopSidePanel::panel().show(ui.ctx(), |ui| panel.ui(ui));
} }
} }
impl Preview for DesktopSidePanel<'_> { impl Preview for DesktopSidePanel {
type Prev = DesktopSidePanelPreview; type Prev = DesktopSidePanelPreview;
fn preview() -> Self::Prev { fn preview() -> Self::Prev {