From e22964a1b66df01d8e0a998a05c51e282f9b54b6 Mon Sep 17 00:00:00 2001 From: ultrageese Date: Wed, 13 May 2026 07:46:24 +1000 Subject: [PATCH] =?UTF-8?q?=D0=AD=D1=82=D0=BE=20=D0=B2=D1=81=D1=91=20?= =?UTF-8?q?=D0=B5=D1=89=D1=91=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D1=85=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=20=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=20=D0=BD=D0=BE=20=D0=BC=D0=BD=D0=B5=20=D0=BD=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/Cargo.lock | 155 +++++++++++++++++++++++++++++++-------------- code/Cargo.toml | 2 +- code/src/app.rs | 23 ++++++- documents/ссылочки | 1 + 4 files changed, 133 insertions(+), 48 deletions(-) create mode 100644 documents/ссылочки diff --git a/code/Cargo.lock b/code/Cargo.lock index ed06430..e1f95eb 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -24,8 +24,6 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5351dcebb14b579ccab05f288596b2ae097005be7ee50a7c3d4ca9d0d5a66f6a" dependencies = [ - "enumn", - "serde", "uuid", ] @@ -38,7 +36,7 @@ dependencies = [ "accesskit", "accesskit_consumer", "atspi-common", - "phf", + "phf 0.13.1", "serde", "zvariant", ] @@ -139,7 +137,6 @@ dependencies = [ "cfg-if", "getrandom 0.3.4", "once_cell", - "serde", "version_check", "zerocopy", ] @@ -693,7 +690,7 @@ dependencies = [ "eframe", "egui", "egui_dock", - "egui_table", + "egui_extras", "rust_decimal", ] @@ -982,7 +979,6 @@ checksum = "55f6cc0cb3b84a21232c468db972ebcddd34decbf1ff02cdebffd807c13bbd81" dependencies = [ "bytemuck", "emath", - "serde", ] [[package]] @@ -1035,7 +1031,6 @@ dependencies = [ "log", "nohash-hasher", "profiling", - "serde", "smallvec", "unicode-segmentation", ] @@ -1094,6 +1089,20 @@ dependencies = [ "thiserror 2.0.18", ] +[[package]] +name = "egui_extras" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c609fc87f6c70ffd3afd679cbb294985096d2fc0be33e762ad5614bde4925bc" +dependencies = [ + "ahash 0.8.12", + "egui", + "enum-map", + "log", + "mime_guess2", + "profiling", +] + [[package]] name = "egui_glow" version = "0.34.2" @@ -1111,17 +1120,6 @@ dependencies = [ "winit", ] -[[package]] -name = "egui_table" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512decdd471a2b6106d0b42cc0662f0e94b0ca8f21bc1b0075f455f58901010" -dependencies = [ - "egui", - "serde", - "vec1", -] - [[package]] name = "either" version = "1.15.0" @@ -1135,7 +1133,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a74fbbf7501c430b89df62d102b6bfa02162faaf3e155512c677c9d20f5708d1" dependencies = [ "bytemuck", - "serde", ] [[package]] @@ -1144,6 +1141,26 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099" +[[package]] +name = "enum-map" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" +dependencies = [ + "enum-map-derive", +] + +[[package]] +name = "enum-map-derive" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "enumflags2" version = "0.7.12" @@ -1165,17 +1182,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "enumn" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "epaint" version = "0.34.2" @@ -1193,7 +1199,6 @@ dependencies = [ "parking_lot", "profiling", "self_cell", - "serde", "skrifa", "smallvec", "vello_cpu", @@ -1328,7 +1333,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7" dependencies = [ "bytemuck", - "serde", ] [[package]] @@ -2056,6 +2060,24 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess2" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1706dc14a2e140dec0a7a07109d9a3d5890b81e85bd6c60b906b249a77adf0ca" +dependencies = [ + "mime", + "phf 0.11.3", + "phf_shared 0.11.3", + "unicase", +] + [[package]] name = "miniz_oxide" version = "0.8.9" @@ -2588,17 +2610,37 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros 0.11.3", + "phf_shared 0.11.3", +] + [[package]] name = "phf" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ - "phf_macros", - "phf_shared", + "phf_macros 0.13.1", + "phf_shared 0.13.1", "serde", ] +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared 0.11.3", + "rand", +] + [[package]] name = "phf_generator" version = "0.13.1" @@ -2606,7 +2648,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ "fastrand", - "phf_shared", + "phf_shared 0.13.1", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", + "syn 2.0.117", + "unicase", ] [[package]] @@ -2615,13 +2671,23 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.13.1", + "phf_shared 0.13.1", "proc-macro2", "quote", "syn 2.0.117", ] +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher", + "unicase", +] + [[package]] name = "phf_shared" version = "0.13.1" @@ -3252,9 +3318,6 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -dependencies = [ - "serde", -] [[package]] name = "smithay-client-toolkit" @@ -3614,6 +3677,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "unicase" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" + [[package]] name = "unicode-ident" version = "1.0.24" @@ -3673,12 +3742,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec1" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab68b56840f69efb0fefbe3ab6661499217ffdc58e2eef7c3f6f69835386322" - [[package]] name = "vello_common" version = "0.0.6" diff --git a/code/Cargo.toml b/code/Cargo.toml index 45b6544..5a5f01a 100644 --- a/code/Cargo.toml +++ b/code/Cargo.toml @@ -9,5 +9,5 @@ diesel = { version = "2.3.9", features = ["mysql", "chrono"] } eframe = "0.34.2" egui = "0.34.2" egui_dock = "0.19.1" -egui_table = "0.8.0" +egui_extras = "0.34.2" rust_decimal = "1.42.0" diff --git a/code/src/app.rs b/code/src/app.rs index cad45dc..ee61dbb 100644 --- a/code/src/app.rs +++ b/code/src/app.rs @@ -60,7 +60,28 @@ impl eframe::App for App{ struct MainTabViewer {} impl MainTabViewer{ fn show_equipment(&mut self, ui: &mut egui::Ui){ - ui.label("Equipment"); + use egui_extras::{Column,TableBuilder}; + let text_height =egui::TextStyle::Body.resolve(ui.style()).size; + let available_heigh = ui.available_height(); + let mut table = TableBuilder::new(ui) + .striped(true) + .resizable(false) + .cell_layout(egui::Layout::left_to_right(egui::Align::Center)) + .column(Column::auto()) + .column(Column::remainder() + .at_least(40.0) + .clip(true) + .resizable(true), + ) + .column(Column::auto()) + .column(Column::remainder()) + .column(Column::remainder()) + .min_scrolled_height(0.0) + .max_scroll_height(available_heigh); + table = table.sense(egui::Sense::click()); + + + } fn show_worker(&mut self, ui: &mut egui::Ui){ ui.label("Worker"); diff --git a/documents/ссылочки b/documents/ссылочки new file mode 100644 index 0000000..436bd49 --- /dev/null +++ b/documents/ссылочки @@ -0,0 +1 @@ +https://github.com/emilk/egui/blob/main/crates/egui_demo_lib/src/demo/table_demo.rs - зашарить за таблицы \ No newline at end of file