migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 21:30:03 -04:00
Code Activity

merge both crates into egui_extras

Browse Source
This commit is contained in:
René Rössler
2022-01-09 21:56:58 +01:00
parent 7dec7054fb
commit bb5da25a9b
17 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
egui_demo_lib/Cargo.toml
View File

@@ -21,8 +21,7 @@ all-features = true
[dependencies]
egui = { version = "0.16.0", path = "../egui", default-features = false }
epi = { version = "0.16.0", path = "../epi" }
egui_dynamic_grid = { version = "0.16.0", path = "../egui_dynamic_grid" }
egui_datepicker = { version = "0.16.0", path = "../egui_datepicker", optional = true }
egui_extras = { version = "0.16.0", path = "../egui_extras" }
chrono = { version = "0.4", features = ["js-sys", "wasmbind"], optional = true }
enum-map = { version = "1", features = ["serde"] }
@@ -48,7 +47,7 @@ criterion = { version = "0.3", default-features = false }
[features]
default = ["datetime"]
datetime = ["egui_datepicker", "chrono"]
datetime = ["egui_extras/datetime", "chrono"]
# Enable additional checks if debug assertions are enabled (debug builds).
extra_debug_asserts = ["egui/extra_debug_asserts"]
@@ -56,7 +55,12 @@ extra_debug_asserts = ["egui/extra_debug_asserts"]
extra_asserts = ["egui/extra_asserts"]
http = ["ehttp", "image"]
persistence = ["egui/persistence", "epi/persistence", "serde"]
persistence = [
"egui/persistence",
"epi/persistence",
"egui_extras/persistence",
"serde",
]
serialize = ["egui/serialize", "serde"]
syntax_highlighting = ["syntect"]

2
egui_demo_lib/src/apps/demo/grid_demo.rs
View File

@@ -1,5 +1,5 @@
use egui::Color32;
use egui_dynamic_grid::{GridBuilder, Padding, Size};
use egui_extras::{GridBuilder, Padding, Size};
/// Shows off a table with dynamic layout
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]

2
egui_demo_lib/src/apps/demo/table_demo.rs
View File

@@ -1,5 +1,5 @@
use egui::{Label, RichText};
use egui_dynamic_grid::{Padding, Size, TableBuilder};
use egui_extras::{Padding, Size, TableBuilder};
/// Shows off a table with dynamic layout
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]

2
egui_demo_lib/src/apps/demo/widget_gallery.rs
View File

@@ -207,7 +207,7 @@ impl WidgetGallery {
#[cfg(feature = "datetime")]
{
ui.add(doc_link_label("DatePickerButton", "DatePickerButton"));
ui.add(egui_datepicker::DatePickerButton::new(date));
ui.add(egui_extras::DatePickerButton::new(date));
ui.end_row();
}