From fffa5e7795527c45969240f48b01a767766a89d5 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emilernerfeldt@gmail.com>
Date: Sat, 2 Jan 2021 20:32:05 +0100
Subject: [PATCH] [egui] Derive Serialize/Deserialize for a bunch of things

---
 egui/Cargo.toml               | 2 +-
 egui/src/context.rs           | 2 ++
 egui/src/paint/fonts.rs       | 6 +++++-
 egui/src/paint/tessellator.rs | 2 ++
 egui/src/style.rs             | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/egui/Cargo.toml b/egui/Cargo.toml
index 7cfc65d8..2e99b0dd 100644
--- a/egui/Cargo.toml
+++ b/egui/Cargo.toml
@@ -23,7 +23,7 @@ ahash = { version = "0.6", features = ["std"], default-features = false }
 atomic_refcell = { version = "0.1", optional = true } # Used instead of parking_lot when you are always using Egui in a single thread. About as fast as parking_lot. Panics on multi-threaded use of egui::Context.
 parking_lot = { version = "0.11", optional = true } # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios
 rusttype = "0.9"
-serde = { version = "1", features = ["derive"], optional = true }
+serde = { version = "1", features = ["derive", "rc"], optional = true }
 
 [features]
 default = ["atomic_refcell", "default_fonts"]
diff --git a/egui/src/context.rs b/egui/src/context.rs
index 428d4a57..8efe7880 100644
--- a/egui/src/context.rs
+++ b/egui/src/context.rs
@@ -15,6 +15,8 @@ use crate::{
 // ----------------------------------------------------------------------------
 
 #[derive(Clone, Debug, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "serde", serde(default))]
 struct Options {
     /// The default style for new `Ui`:s.
     style: Arc<Style>,
diff --git a/egui/src/paint/fonts.rs b/egui/src/paint/fonts.rs
index 5da5ba96..881f77ae 100644
--- a/egui/src/paint/fonts.rs
+++ b/egui/src/paint/fonts.rs
@@ -45,7 +45,8 @@ impl TextStyle {
 
 /// Which style of font: [`Monospace`][`FontFamily::Monospace`] or [`Proportional`][`FontFamily::Proportional`].
 #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-// #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
 pub enum FontFamily {
     /// A font where each character is the same width (`w` is the same width as `i`).
     Monospace,
@@ -80,12 +81,15 @@ fn rusttype_font_from_font_data(name: &str, data: &FontData) -> rusttype::Font<'
 /// ctx.set_fonts(fonts);
 /// ```
 #[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "serde", serde(default))]
 pub struct FontDefinitions {
     /// List of font names and their definitions.
     /// The definition must be the contents of either a `.ttf` or `.otf` font file.
     ///
     /// Egui has built-in-default for these,
     /// but you can override them if you like.
+    #[cfg_attr(feature = "serde", serde(skip))]
     pub font_data: BTreeMap<String, FontData>,
 
     /// Which fonts (names) to use for each [`FontFamily`].
diff --git a/egui/src/paint/tessellator.rs b/egui/src/paint/tessellator.rs
index 82727b97..5af17374 100644
--- a/egui/src/paint/tessellator.rs
+++ b/egui/src/paint/tessellator.rs
@@ -446,6 +446,8 @@ use self::PathType::{Closed, Open};
 
 /// Tessellation quality options
 #[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "serde", serde(default))]
 pub struct TessellationOptions {
     /// Size of a pixel in points, e.g. 0.5
     pub aa_size: f32,
diff --git a/egui/src/style.rs b/egui/src/style.rs
index 417f464f..88310952 100644
--- a/egui/src/style.rs
+++ b/egui/src/style.rs
@@ -10,6 +10,7 @@ use crate::{
 /// Specifies the look and feel of a [`Ui`].
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "serde", serde(default))]
 pub struct Style {
     /// Default `TextStyle` for normal text (i.e. for `Label` and `TextEdit`).
     pub body_text_style: TextStyle,