[eframe] Make persistence, http and time optional features

Saves on compile times.
2026-08-30 21:30:03 -04:00 · 2021-01-04 01:44:02 +01:00
parent 00269f96c0
commit 69d31a5e47
30 changed files with 412 additions and 303 deletions
--- a/egui_demo_lib/src/apps/color_test.rs
+++ b/egui_demo_lib/src/apps/color_test.rs
@@ -9,9 +9,9 @@ const RED: Color32 = Color32::RED;
 const TRANSPARENT: Color32 = Color32::TRANSPARENT;
 const WHITE: Color32 = Color32::WHITE;

-#[derive(serde::Deserialize, serde::Serialize)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
 pub struct ColorTest {
-    #[serde(skip)]
+    #[cfg_attr(feature = "persistence", serde(skip))]
    tex_mngr: TextureManager,
    vertex_gradients: bool,
    texture_gradients: bool,
--- a/egui_demo_lib/src/apps/demo/app.rs
+++ b/egui_demo_lib/src/apps/demo/app.rs
@@ -2,8 +2,9 @@
 ///
 /// Implements `epi::App` so it can be used with
 /// [`egui_glium`](https://crates.io/crates/egui_glium) and [`egui_web`](https://crates.io/crates/egui_web).
-#[derive(Default, serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[derive(Default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct DemoApp {
    demo_windows: super::DemoWindows,
 }
@@ -13,10 +14,12 @@ impl epi::App for DemoApp {
        "✨ Egui Demo"
    }

+    #[cfg(feature = "persistence")]
    fn load(&mut self, storage: &dyn epi::Storage) {
        *self = epi::get_value(storage, epi::APP_KEY).unwrap_or_default()
    }

+    #[cfg(feature = "persistence")]
    fn save(&mut self, storage: &mut dyn epi::Storage) {
        epi::set_value(storage, epi::APP_KEY, self);
    }
--- a/egui_demo_lib/src/apps/demo/dancing_strings.rs
+++ b/egui_demo_lib/src/apps/demo/dancing_strings.rs
@@ -1,7 +1,7 @@
 use egui::{containers::*, *};

-#[derive(serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct DancingStrings {}

 impl Default for DancingStrings {
--- a/egui_demo_lib/src/apps/demo/demo_window.rs
+++ b/egui_demo_lib/src/apps/demo/demo_window.rs
@@ -2,8 +2,8 @@ use super::*;
 use egui::{color::*, *};

 /// Showcase some ui code
-#[derive(serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct DemoWindow {
    num_columns: usize,

@@ -106,8 +106,9 @@ impl DemoWindow {

 // ----------------------------------------------------------------------------

-#[derive(PartialEq, serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[derive(PartialEq)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 struct ColorWidgets {
    srgba_unmul: [u8; 4],
    srgba_premul: [u8; 4],
@@ -176,8 +177,8 @@ impl ColorWidgets {

 // ----------------------------------------------------------------------------

-#[derive(serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 struct BoxPainting {
    size: Vec2,
    corner_radius: f32,
@@ -220,8 +221,8 @@ impl BoxPainting {

 // ----------------------------------------------------------------------------

-#[derive(serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 struct LayoutDemo {
    // Identical to contents of `egui::Layout`
    main_dir: Direction,
@@ -363,7 +364,8 @@ enum Action {
    Delete,
 }

-#[derive(Clone, Default, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
 struct Tree(Vec<Tree>);

 impl Tree {
--- a/egui_demo_lib/src/apps/demo/demo_windows.rs
+++ b/egui_demo_lib/src/apps/demo/demo_windows.rs
@@ -2,11 +2,11 @@ use egui::{CtxRef, Resize, ScrollArea, Ui, Window};

 // ----------------------------------------------------------------------------

-#[derive(serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 struct Demos {
    /// open, view
-    #[serde(skip)] // TODO: serialize the `open` state.
+    #[cfg_attr(feature = "persistence", serde(skip))] // TODO: serialize the `open` state.
    demos: Vec<(bool, Box<dyn super::Demo>)>,
 }
 impl Default for Demos {
@@ -40,8 +40,9 @@ impl Demos {
 // ----------------------------------------------------------------------------

 /// A menu bar in which you can select different demo windows to show.
-#[derive(Default, serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[derive(Default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct DemoWindows {
    open_windows: OpenWindows,

@@ -189,7 +190,7 @@ impl DemoWindows {

 // ----------------------------------------------------------------------------

-#[derive(serde::Deserialize, serde::Serialize)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
 struct OpenWindows {
    demo: bool,

--- a/egui_demo_lib/src/apps/demo/painting.rs
+++ b/egui_demo_lib/src/apps/demo/painting.rs
@@ -1,7 +1,7 @@
 use egui::*;

-#[derive(serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct Painting {
    lines: Vec<Vec<Vec2>>,
    stroke: Stroke,
--- a/egui_demo_lib/src/apps/demo/scrolls.rs
+++ b/egui_demo_lib/src/apps/demo/scrolls.rs
@@ -1,7 +1,7 @@
 use egui::{color::*, *};

-#[derive(serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct Scrolls {
    track_item: usize,
    tracking: bool,
--- a/egui_demo_lib/src/apps/demo/sliders.rs
+++ b/egui_demo_lib/src/apps/demo/sliders.rs
@@ -2,8 +2,9 @@ use egui::*;
 use std::f64::INFINITY;

 /// Showcase sliders
-#[derive(PartialEq, serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[derive(PartialEq)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct Sliders {
    pub min: f64,
    pub max: f64,
--- a/egui_demo_lib/src/apps/demo/widgets.rs
+++ b/egui_demo_lib/src/apps/demo/widgets.rs
@@ -1,6 +1,7 @@
 use egui::{color::*, *};

-#[derive(Debug, PartialEq, serde::Deserialize, serde::Serialize)]
+#[derive(Debug, PartialEq)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
 enum Enum {
    First,
    Second,
@@ -13,8 +14,8 @@ impl Default for Enum {
    }
 }

-#[derive(serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct Widgets {
    button_enabled: bool,
    count: usize,
--- a/egui_demo_lib/src/apps/demo/window_options.rs
+++ b/egui_demo_lib/src/apps/demo/window_options.rs
@@ -1,6 +1,7 @@
 use crate::__egui_github_link_file;

-#[derive(Clone, PartialEq, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, PartialEq)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
 pub struct WindowOptions {
    title: String,
    title_bar: bool,
--- a/egui_demo_lib/src/apps/fractal_clock.rs
+++ b/egui_demo_lib/src/apps/fractal_clock.rs
@@ -1,8 +1,9 @@
 use egui::{containers::*, widgets::*, *};
 use std::f32::consts::TAU;

-#[derive(PartialEq, serde::Deserialize, serde::Serialize)]
-#[serde(default)]
+#[derive(PartialEq)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct FractalClock {
    paused: bool,
    time: f64,
--- a/egui_demo_lib/src/apps/http_app.rs
+++ b/egui_demo_lib/src/apps/http_app.rs
@@ -30,17 +30,17 @@ impl Resource {
    }
 }

-#[derive(serde::Deserialize, serde::Serialize)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
 pub struct HttpApp {
    url: String,

-    #[serde(skip)]
+    #[cfg_attr(feature = "persistence", serde(skip))]
    in_progress: Option<Receiver<Result<Response, String>>>,

-    #[serde(skip)]
+    #[cfg_attr(feature = "persistence", serde(skip))]
    result: Option<Result<Resource, String>>,

-    #[serde(skip)]
+    #[cfg_attr(feature = "persistence", serde(skip))]
    tex_mngr: TexMngr,
 }

--- a/egui_demo_lib/src/apps/mod.rs
+++ b/egui_demo_lib/src/apps/mod.rs
@@ -1,11 +1,13 @@
 mod color_test;
 mod demo;
 mod fractal_clock;
+#[cfg(feature = "http")]
 mod http_app;

 pub use color_test::ColorTest;
 pub use demo::DemoApp;
 pub use fractal_clock::FractalClock;
+#[cfg(feature = "http")]
 pub use http_app::HttpApp;

 pub use demo::DemoWindows; // used for tests