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

Fix compilation of egui_extras without serde feature (#5014)

Browse Source 
* Closes https://github.com/emilk/egui/issues/4771
This commit is contained in:
Emil Ernerfeldt
2024-08-27 11:38:33 +02:00
committed by GitHub
parent bd7d71e7fd
commit 58bc67e02f
8 changed files with 82 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
crates/egui_extras/src/table.rs
View File

@@ -543,12 +543,13 @@ impl TableState {
let rect = Rect::from_min_size(ui.available_rect_before_wrap().min, Vec2::ZERO);
ui.ctx().check_for_id_clash(state_id, rect, "Table");
let state = ui
.data_mut(|d| d.get_persisted::<Self>(state_id))
.filter(|state| {
// make sure that the stored widths aren't out-dated
state.column_widths.len() == columns.len()
});
#[cfg(feature = "serde")]
let state = ui.data_mut(|d| d.get_persisted::<Self>(state_id));
#[cfg(not(feature = "serde"))]
let state = ui.data_mut(|d| d.get_temp::<Self>(state_id));
// Make sure that the stored widths aren't out-dated:
let state = state.filter(|state| state.column_widths.len() == columns.len());
let is_sizing_pass =
ui.is_sizing_pass() || state.is_none() && columns.iter().any(|c| c.is_auto());
@@ -597,7 +598,15 @@ impl TableState {
}
fn store(self, ui: &egui::Ui, state_id: egui::Id) {
ui.data_mut(|d| d.insert_persisted(state_id, self));
#![allow(clippy::needless_return)]
#[cfg(feature = "serde")]
{
return ui.data_mut(|d| d.insert_persisted(state_id, self));
}
#[cfg(not(feature = "serde"))]
{
return ui.data_mut(|d| d.insert_temp(state_id, self));
}
}
fn reset(ui: &egui::Ui, state_id: egui::Id) {