Skip to content

fix(ui): stable widget ids for Layers rows and XPS workbench tabs #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nmrtist merged 1 commit into from
Sep 4, 2026
Merged

fix(ui): stable widget ids for Layers rows and XPS workbench tabs #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
169 changes: 4 additions & 165 deletions crates/app/src/ui/primary_sidebar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use crate::ui::switcher;
use egui::Ui;
use egui_phosphor::regular as icon;
use plotx_core::actions::{Action, ZOrder};
use plotx_core::actions::Action;
use plotx_core::state::{
FrameRef, ObjectId, PlotxApp, PrimaryView, RegionSelection, RenameState, RenameTarget,
FrameRef, PlotxApp, PrimaryView, RegionSelection, RenameState, RenameTarget,
};
mod board_views;
mod data_browser;
Expand All @@ -12,9 +12,7 @@ mod layers_tree;
pub(crate) mod selection;
use board_views::board_views_section;
use data_browser::{AnalysisItem, AnalysisKind, DataTree, DatasetNode};
use layer_controls::{
kind_glyph, kind_label, lock_button, row as layer_row, truncated_selectable, visibility_button,
};
use layer_controls::truncated_selectable;
use selection::*;

pub fn render(app: &mut PlotxApp, ui: &mut Ui) {
Expand Down Expand Up @@ -148,7 +146,7 @@ fn canvas_list(app: &mut PlotxApp, ui: &mut Ui) {
ui.separator();
ui.add_space(4.0);
ui.label(crate::typography::headline("Layers"));
object_list(app, ci, ui);
layers_tree::object_list(app, ci, ui);
}
if let Some((ci, name)) = commit {
let trimmed = name.trim();
Expand Down Expand Up @@ -207,165 +205,6 @@ fn canvas_list(app: &mut PlotxApp, ui: &mut Ui) {
app.execute_action(action);
}
}
fn object_list(app: &mut PlotxApp, ci: usize, ui: &mut Ui) {
layers_tree::render_panels(app, ci, ui);
let mut select = None;
let mut reorder: Option<(ObjectId, ZOrder)> = None;
let mut transfer: Option<(ObjectId, usize, bool)> = None;
let others = crate::ui::menus::other_canvas_destinations(app, ci);
let panel_destinations: Vec<_> = app.doc.canvases[ci]
.panels
.iter()
.filter(|panel| !panel.locked)
.map(|panel| (panel.id, layers_tree::panel_tree_name(app, ci, panel)))
.collect();
let count = app.doc.canvases[ci].objects.len();
for row in 0..count {
let oi = count - 1 - row;
let object_id = app.doc.canvases[ci].objects[oi].id;
if app.doc.canvases[ci].parent_panel(object_id).is_some() {
continue;
}
let locked_before = app.doc.canvases[ci].objects[oi].locked;
let (_, (lock_change, row_reorder)) = layer_row(
ui,
|ui| {
let mut visible = app.doc.canvases[ci].objects[oi].visible;
if visibility_button(ui, &mut visible).changed() {
let before = (
app.doc.canvases[ci].objects[oi].visible,
app.doc.canvases[ci].objects[oi].locked,
);
app.execute_action(Action::set_object_flags(
ci,
object_id,
before,
(visible, before.1),
));
}
ui.weak(kind_glyph(&app.doc.canvases[ci].objects[oi].kind))
.on_hover_text(kind_label(&app.doc.canvases[ci].objects[oi].kind));
if app.doc.canvases[ci]
.content_group(app.doc.canvases[ci].objects[oi].id)
.is_some()
{
ui.weak(egui::RichText::new("⛓").small())
.on_hover_text("Grouped");
}
let selected = app.session.ui.selection.contains(object_id)
|| app.session.ui.selection.object() == Some(object_id);
let resp = truncated_selectable(
ui,
selected,
app.doc.canvases[ci].objects[oi].name.clone(),
)
.interact(egui::Sense::click_and_drag());
if resp.drag_started() {
app.session.ui.layers_drag_content = Some(object_id);
}
if resp.clicked() || (resp.secondary_clicked() && !selected) {
claim_list_keyboard_focus(ui, &resp);
select = Some((object_id, select_modifiers(ui)));
}
resp.context_menu(|ui| {
object_transfer_menu(ui, object_id, &others, &mut transfer);
if !panel_destinations.is_empty() {
ui.menu_button("Move into panel", |ui| {
for (panel, name) in &panel_destinations {
if ui.button(name).clicked() {
app.select_content(ci, object_id);
crate::ui::commands::execute_without_clipboard(
crate::ui::commands::CommandId::MoveContentToPanel(Some(
*panel,
)),
app,
ui.ctx(),
);
ui.close();
}
}
});
}
});
},
|ui| {
let mut locked = locked_before;
let lock_change = lock_button(ui, &mut locked).changed().then_some(locked);
let mut row_reorder = None;
if ui
.add_enabled(
row + 1 < count,
egui::Button::new(icon::CARET_DOWN).small().frame(false),
)
.on_hover_text("Send backward")
.clicked()
{
row_reorder = Some(ZOrder::Backward);
}
if ui
.add_enabled(
row > 0,
egui::Button::new(icon::CARET_UP).small().frame(false),
)
.on_hover_text("Bring forward")
.clicked()
{
row_reorder = Some(ZOrder::Forward);
}
(lock_change, row_reorder)
},
);
if let Some(locked) = lock_change
&& let Some(target) = app.object_target(ci, object_id)
&& let Ok(commit) = app.plan_property_write(
plotx_core::properties::object::LOCKED,
std::slice::from_ref(&target),
&plotx_core::properties::PropertyValue::Bool(locked),
)
{
app.commit_property(commit);
}
if let Some(operation) = row_reorder {
reorder = Some((object_id, operation));
}
}
if let Some((object_id, modifiers)) = select {
app.session.ui.selection_scope = plotx_core::state::SelectionScope::Layers;
select_layer_range(app, ci, object_id, modifiers);
let active = app.doc.canvases[ci]
.object(object_id)
.and_then(|object| object.dataset())
.and_then(|id| app.doc.dataset_index(id));
app.set_active_dataset(active);
app.reset_interaction();
app.session.ui.panel_note_inline_edit = None;
app.session.ui.panel_note_edit = None;
}
if let Some((object_id, op)) = reorder {
app.apply_z_order(ci, &[object_id], op);
}
if let Some((object_id, to, is_move)) = transfer {
app.transfer_objects_to_canvas(ci, &[object_id], to, is_move);
}
}
fn object_transfer_menu(
ui: &mut Ui,
object_id: ObjectId,
others: &[(usize, String)],
transfer: &mut Option<(ObjectId, usize, bool)>,
) {
let mut picked = None;
crate::ui::menus::transfer_to_canvas_menu(
ui,
others,
"Move to canvas",
"Copy to canvas",
&mut picked,
);
if let Some((to, is_move)) = picked {
*transfer = Some((object_id, to, is_move));
}
}
fn data_list(app: &mut PlotxApp, ui: &mut Ui) {
if app.doc.datasets.is_empty() {
ui.weak("No data yet. Open an acquisition from the toolbar.");
Expand Down
Loading
Loading