From 52161b6a287cb3f6692fa140e83cf0c7ec592121 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Sat, 24 Sep 2022 17:57:16 +0200
Subject: [PATCH] Update to latest egui

Includes recent improvements to text rendering:
* https://github.com/emilk/egui/pull/2071
* https://github.com/emilk/egui/pull/2070
* https://github.com/emilk/egui/pull/2069
---
 Cargo.lock | 14 +++++++-------
 Cargo.toml | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b4b2e0daa52..38aa2dd01d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -839,7 +839,7 @@ dependencies = [
 [[package]]
 name = "eframe"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=12dc61ed0f1a23b45e336799005d62e0a6f47e4f#12dc61ed0f1a23b45e336799005d62e0a6f47e4f"
+source = "git+https://github.com/emilk/egui?rev=4ac1e28eaefd1c389034e1bc065d83801882e8c7#4ac1e28eaefd1c389034e1bc065d83801882e8c7"
 dependencies = [
  "bytemuck",
  "directories-next",
@@ -864,7 +864,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=12dc61ed0f1a23b45e336799005d62e0a6f47e4f#12dc61ed0f1a23b45e336799005d62e0a6f47e4f"
+source = "git+https://github.com/emilk/egui?rev=4ac1e28eaefd1c389034e1bc065d83801882e8c7#4ac1e28eaefd1c389034e1bc065d83801882e8c7"
 dependencies = [
  "ahash 0.8.0",
  "epaint",
@@ -877,7 +877,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=12dc61ed0f1a23b45e336799005d62e0a6f47e4f#12dc61ed0f1a23b45e336799005d62e0a6f47e4f"
+source = "git+https://github.com/emilk/egui?rev=4ac1e28eaefd1c389034e1bc065d83801882e8c7#4ac1e28eaefd1c389034e1bc065d83801882e8c7"
 dependencies = [
  "arboard",
  "egui",
@@ -902,7 +902,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=12dc61ed0f1a23b45e336799005d62e0a6f47e4f#12dc61ed0f1a23b45e336799005d62e0a6f47e4f"
+source = "git+https://github.com/emilk/egui?rev=4ac1e28eaefd1c389034e1bc065d83801882e8c7#4ac1e28eaefd1c389034e1bc065d83801882e8c7"
 dependencies = [
  "egui",
  "tracing",
@@ -911,7 +911,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=12dc61ed0f1a23b45e336799005d62e0a6f47e4f#12dc61ed0f1a23b45e336799005d62e0a6f47e4f"
+source = "git+https://github.com/emilk/egui?rev=4ac1e28eaefd1c389034e1bc065d83801882e8c7#4ac1e28eaefd1c389034e1bc065d83801882e8c7"
 dependencies = [
  "bytemuck",
  "egui",
@@ -933,7 +933,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 [[package]]
 name = "emath"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=12dc61ed0f1a23b45e336799005d62e0a6f47e4f#12dc61ed0f1a23b45e336799005d62e0a6f47e4f"
+source = "git+https://github.com/emilk/egui?rev=4ac1e28eaefd1c389034e1bc065d83801882e8c7#4ac1e28eaefd1c389034e1bc065d83801882e8c7"
 dependencies = [
  "bytemuck",
  "serde",
@@ -942,7 +942,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=12dc61ed0f1a23b45e336799005d62e0a6f47e4f#12dc61ed0f1a23b45e336799005d62e0a6f47e4f"
+source = "git+https://github.com/emilk/egui?rev=4ac1e28eaefd1c389034e1bc065d83801882e8c7#4ac1e28eaefd1c389034e1bc065d83801882e8c7"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.0",
diff --git a/Cargo.toml b/Cargo.toml
index f1032a92dfc..ececfedd3cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,11 +14,11 @@ exclude = ["examples/nyud"]
 debug = true
 
 [patch.crates-io]
-# 2022-09-21 (updated arboard)
-eframe = { git = "https://github.com/emilk/egui", rev = "12dc61ed0f1a23b45e336799005d62e0a6f47e4f" }
-egui = { git = "https://github.com/emilk/egui", rev = "12dc61ed0f1a23b45e336799005d62e0a6f47e4f" }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "12dc61ed0f1a23b45e336799005d62e0a6f47e4f" }
-egui_glow = { git = "https://github.com/emilk/egui", rev = "12dc61ed0f1a23b45e336799005d62e0a6f47e4f" }
+# 2022-09-24 - fix text size and font rendering
+eframe = { git = "https://github.com/emilk/egui", rev = "4ac1e28eaefd1c389034e1bc065d83801882e8c7" }
+egui = { git = "https://github.com/emilk/egui", rev = "4ac1e28eaefd1c389034e1bc065d83801882e8c7" }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "4ac1e28eaefd1c389034e1bc065d83801882e8c7" }
+egui_glow = { git = "https://github.com/emilk/egui", rev = "4ac1e28eaefd1c389034e1bc065d83801882e8c7" }
 
 # Because gltf hasn't published a new version: https://github.com/gltf-rs/gltf/issues/357
 gltf = { git = "https://github.com/rerun-io/gltf", rev = "3c14ded73755d1ce9e47010edb06db63cb7e2cca" }