diff --git a/CHANGELOG.md b/CHANGELOG.md index a29fdade..55ad0403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui_w * When using a custom font you can now specify a font index ([#873](https://github.com/emilk/egui/pull/873)). * You can now read the plot coordinates of the mouse when building a `Plot` ([#766](https://github.com/emilk/egui/pull/766)). * Add vertical sliders with `Slider::new(…).vertical()` ([#875](https://github.com/emilk/egui/pull/875)). +* Add `Button::image_and_text` ([#832](https://github.com/emilk/egui/pull/832)). ### Changed 🔧 * Unifiy the four `Memory` data buckets (`data`, `data_temp`, `id_data` and `id_data_temp`) into a single `Memory::data`, with a new interface ([#836](https://github.com/emilk/egui/pull/836)). @@ -34,9 +35,10 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui_w ### Contributors 🙏 * [5225225](https://github.com/5225225): ([#849](https://github.com/emilk/egui/pull/849)). * [B-Reif](https://github.com/B-Reif) ([#875](https://github.com/emilk/egui/pull/875)). +* [d10sfan](https://github.com/d10sfan) ([#832](https://github.com/emilk/egui/pull/832)). * [EmbersArc](https://github.com/EmbersArc): ([#766](https://github.com/emilk/egui/pull/766)). -* [mankinskin](https://github.com/mankinskin) ([#543](https://github.com/emilk/egui/pull/543)) -* [sumibi-yakitori](https://github.com/sumibi-yakitori) ([#830](https://github.com/emilk/egui/pull/830)) +* [mankinskin](https://github.com/mankinskin) ([#543](https://github.com/emilk/egui/pull/543)). +* [sumibi-yakitori](https://github.com/sumibi-yakitori) ([#830](https://github.com/emilk/egui/pull/830)). * [t18b219k](https://github.com/t18b219k): ([#868](https://github.com/emilk/egui/pull/868), [#888](https://github.com/emilk/egui/pull/888)).