Skip to content
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

Unify user interface crates #154

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Unify user interface crates #154

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
108 changes: 8 additions & 100 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,13 @@ js-sys = "0.3"
lexical-sort = "0.3.1"

luminol-audio = { version = "0.4.0", path = "crates/audio/" }
luminol-components = { version = "0.4.0", path = "crates/components/" }
luminol-config = { version = "0.4.0", path = "crates/config/" }
luminol-core = { version = "0.4.0", path = "crates/core/" }
luminol-data = { version = "0.4.0", path = "crates/data/" }
luminol-filesystem = { version = "0.4.0", path = "crates/filesystem/" }
luminol-graphics = { version = "0.4.0", path = "crates/graphics/" }
luminol-macros = { version = "0.4.0", path = "crates/macros/" }
luminol-proc-macros = { version = "0.4.0", path = "crates/proc-macros/" }
luminol-modals = { version = "0.4.0", path = "crates/modals/" }
luminol-term = { version = "0.4.0", path = "crates/term/" }
luminol-ui = { version = "0.4.0", path = "crates/ui/" }
luminol-result = { version = "0.4.0", path = "crates/result" }
Expand Down
55 changes: 0 additions & 55 deletions crates/components/Cargo.toml
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions crates/modals/Cargo.toml
View file
Open in desktop

This file was deleted.

17 changes: 15 additions & 2 deletions crates/ui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ luminol-config.workspace = true
luminol-data.workspace = true
luminol-graphics.workspace = true
luminol-filesystem.workspace = true
luminol-components.workspace = true
luminol-modals.workspace = true
luminol-macros.workspace = true
luminol-egui-wgpu.workspace = true

egui.workspace = true
egui-modal.workspace = true
Expand Down Expand Up @@ -54,6 +53,8 @@ zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
parking_lot.workspace = true
once_cell.workspace = true
qp-trie.workspace = true
indextree = "4.6.0"
lexical-sort.workspace = true

itertools.workspace = true

Expand All @@ -65,5 +66,17 @@ murmur3.workspace = true
indexmap = "2.2.6"
alox-48.workspace = true

fuzzy-matcher = "0.3.7"

glam.workspace = true

oneshot.workspace = true

image.workspace = true

syntect = { version = "5.1.0", default-features = false, features = [
"default-fancy",
] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
luminol-term = { version = "0.4.0", path = "../term/" }
0 ...es/components/src/animation_frame_view.rs → ...ui/src/components/animation_frame_view.rs
View file
Open in desktop
File renamed without changes.
0 crates/components/src/cellpicker.rs → crates/ui/src/components/cellpicker.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion crates/components/src/collapsing_view.rs → crates/ui/src/components/collapsing_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// terms of the Steamworks API by Valve Corporation, the licensors of this
// Program grant you additional permission to convey the resulting work.

use crate::UiExt;
use super::UiExt;

/// A component that shows many copies of a layout and only allows one of them to be expanded at a
/// time.
Expand Down
0 ...components/src/command_view/command_ui.rs → ...src/components/command_view/command_ui.rs
View file
Open in desktop
File renamed without changes.
0 crates/components/src/command_view/macros.rs → .../ui/src/components/command_view/macros.rs
View file
Open in desktop
File renamed without changes.
0 crates/components/src/command_view/mod.rs → crates/ui/src/components/command_view/mod.rs
View file
Open in desktop
File renamed without changes.
0 ...mponents/src/command_view/parameter_ui.rs → ...c/components/command_view/parameter_ui.rs
View file
Open in desktop
File renamed without changes.
0 crates/components/src/command_view/ui.rs → crates/ui/src/components/command_view/ui.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion crates/components/src/database_view.rs → crates/ui/src/components/database_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// terms of the Steamworks API by Valve Corporation, the licensors of this
// Program grant you additional permission to convey the resulting work.

use crate::UiExt;
use super::UiExt;
use itertools::Itertools;

pub struct DatabaseViewResponse<R> {
Expand Down
2 changes: 1 addition & 1 deletion crates/components/src/filesystem_view.rs → crates/ui/src/components/filesystem_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// terms of the Steamworks API by Valve Corporation, the licensors of this
// Program grant you additional permission to convey the resulting work.

use crate::UiExt;
use super::UiExt;
use itertools::Itertools;

pub struct FileSystemView<T> {
Expand Down
2 changes: 1 addition & 1 deletion crates/components/src/id_vec.rs → crates/ui/src/components/id_vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// terms of the Steamworks API by Valve Corporation, the licensors of this
// Program grant you additional permission to convey the resulting work.

use crate::UiExt;
use super::UiExt;
use itertools::Itertools;

#[derive(Default, Clone)]
Expand Down
2 changes: 1 addition & 1 deletion crates/components/src/map_view.rs → crates/ui/src/components/map_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ impl MapView {
ui: &mut egui::Ui,
update_state: &luminol_core::UpdateState<'_>,
map: &luminol_data::rpg::Map,
tilepicker: &crate::Tilepicker,
tilepicker: &super::Tilepicker,
dragging_event: bool,
drawing_shape: bool,
drawing_shape_pos: Option<egui::Pos2>,
Expand Down
0 crates/components/src/lib.rs → crates/ui/src/components/mod.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion crates/components/src/sound_tab.rs → crates/ui/src/components/sound_tab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// terms of the Steamworks API by Valve Corporation, the licensors of this
// Program grant you additional permission to convey the resulting work.

use crate::UiExt;
use super::UiExt;

pub struct SoundTab {
/// The source for this tab.
Expand Down
0 crates/components/src/syntax_highlighting.rs → .../ui/src/components/syntax_highlighting.rs
View file
Open in desktop
File renamed without changes.
0 crates/components/src/tilepicker.rs → crates/ui/src/components/tilepicker.rs
View file
Open in desktop
File renamed without changes.
0 crates/components/src/ui_ext.rs → crates/ui/src/components/ui_ext.rs
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion crates/ui/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
// it with Steamworks API by Valve Corporation, containing parts covered by
// terms of the Steamworks API by Valve Corporation, the licensors of this
// Program grant you additional permission to convey the resulting work.
#![cfg_attr(target_arch = "wasm32", allow(clippy::arc_with_non_send_sync))]

pub type UpdateState<'res> = luminol_core::UpdateState<'res>;

pub mod components;
pub mod modals;
pub mod tabs;

pub mod windows;

macro_rules! tab_enum {
Expand Down
Loading