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

Refactor: Clump area logic together inside of Memory

Browse Source
This commit is contained in:
Emil Ernerfeldt
2020-05-10 19:02:17 +02:00
parent 9dab3628a1
commit 216036e49c
3 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
emigui/src/containers/area.rs
View File

@@ -99,18 +99,12 @@ impl Area {
let id = ctx.register_unique_id(id, "Area", default_pos);
let layer = Layer { order, id };
let (mut state, _is_new) = match ctx.memory().get_area(id) {
Some(state) => (state, false),
None => {
let state = State {
pos: default_pos,
size: Vec2::zero(),
interactable,
vel: Vec2::zero(),
};
(state, true)
}
};
let mut state = ctx.memory().areas.get(id).unwrap_or_else(|| State {
pos: default_pos,
size: Vec2::zero(),
interactable,
vel: Vec2::zero(),
});
state.pos = fixed_pos.unwrap_or(state.pos);
state.pos = state.pos.round();
@@ -162,9 +156,9 @@ impl Area {
// );
if move_interact.active || mouse_pressed_on_area(ctx, layer) {
ctx.memory().move_area_to_top(layer);
ctx.memory().areas.move_to_top(layer);
}
ctx.memory().set_area_state(layer, state);
ctx.memory().areas.set_state(layer, state);
move_interact
}