Skip to content

Commit f417c5d

Browse files
committed
PlannerGUI - bump egui_deferred_tables. Use expandable columns functionality.
1 parent 961ec17 commit f417c5d

5 files changed

Lines changed: 8 additions & 6 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1715,8 +1715,7 @@ dependencies = [
17151715
[[package]]
17161716
name = "egui_deferred_table"
17171717
version = "0.1.6"
1718-
source = "registry+https://github.com/rust-lang/crates.io-index"
1719-
checksum = "a838d9b1bda3664634ee241f9f45b32352669198fda4ea157e9210830c91d68b"
1718+
source = "git+https://github.com/makerpnp/egui_deferred_table?rev=67f44aaabcc9850c3f0ba2c88d54a468d2a20c5f#67f44aaabcc9850c3f0ba2c88d54a468d2a20c5f"
17201719
dependencies = [
17211720
"egui",
17221721
"indexmap 2.11.1",

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ time = { version = "0.3.41" }
3838
indexmap = { version = "2.9.0" }
3939
slotmap = { version = "1.0.7" }
4040
heck = { version = "0.5.0" }
41-
futures = { version = "0.3.31" }
42-
async-std = { version = "1.13.1" }
4341
petgraph = { version = "0.8.1"}
4442
csv = { version = "1.3.1" }
4543
termtree = { version = "0.5.1"}
@@ -108,8 +106,8 @@ egui_material_icons = { git = "https://github.com/lucasmerlin/hello_egui.git", t
108106
# 1 - https://github.com/LennysLounge/egui_ltreeview/pull/23
109107
egui_ltreeview = { git = "https://github.com/makerpnp/egui_ltreeview", rev = "6e44b06e6ab3b22d3c0f3d790be77650ae74cb53" }
110108

111-
egui_deferred_table = { version = "=0.1.6" }
112-
#egui_deferred_table = { git = "https://github.com/makerpnp/egui_deferred_table", rev = "30d3b269e5305f0b2c30696455322b642fc7281e" }
109+
#egui_deferred_table = { version = "=0.1.6" }
110+
egui_deferred_table = { git = "https://github.com/makerpnp/egui_deferred_table", rev = "67f44aaabcc9850c3f0ba2c88d54a468d2a20c5f" }
113111
#egui_deferred_table = { path = "../../../libraries/rust/egui/egui_deferred_table" }
114112

115113
#egui_double_slider = { version = "0.8.0"}
@@ -151,6 +149,8 @@ puffin_http = { version = "0.16.1" }
151149
# tasks/async
152150
tokio = { version = "1.45.1", features = ["full"]}
153151
crossbeam-channel = { version = "0.5.15" }
152+
futures = { version = "0.3.31" }
153+
async-std = { version = "1.13.1" }
154154

155155
# Gerber rendering, types and parser
156156
# Note, these three crates are tightly coupled, ensure that only one of each appears in the dependency tree.

planning/planner_gui_egui/src/project/tables/load_out.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ impl UiComponent for LoadOutTableUi {
321321
.name(tr!("table-load-out-column-manufacturer")),
322322
AxisParameters::default()
323323
.default_dimension(200.0)
324+
.expandable(true)
324325
.name(tr!("table-load-out-column-mpn")),
325326
])
326327
.show_and_edit(ui, source, renderer, editor, editor_state);

planning/planner_gui_egui/src/project/tables/parts.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ impl UiComponent for PartTableUi {
352352
.default_dimension(100.0),
353353
AxisParameters::default()
354354
.name(tr!("table-parts-column-ref-des-set"))
355+
.expandable(true)
355356
.default_dimension(100.0),
356357
])
357358
.show_and_edit(ui, source, renderer, editor, editor_state);

planning/planner_gui_egui/src/project/tables/placements.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ impl UiComponent for PlacementsTableUi {
523523
.default_dimension(200.0),
524524
AxisParameters::default()
525525
.name(tr!("table-placements-column-mpn"))
526+
.expandable(true)
526527
.default_dimension(200.0),
527528
AxisParameters::default().name(tr!("table-placements-column-rotation")),
528529
AxisParameters::default().name(tr!("table-placements-column-x")),

0 commit comments

Comments
 (0)