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.

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

fix(launcher): 🐛 Restore Launcher #2058

Merged
merged 6 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,6 @@ node_modules
# The .gitignore for android is project folder.

# flatpak
.flatpak*
.flatpak*

ALVR-Launcher
97 changes: 78 additions & 19 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion alvr/client_mock/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ alvr_client_core.workspace = true
alvr_packets.workspace = true
alvr_session.workspace = true

eframe = "0.26"
eframe = "0.27"
env_logger = "0.11"
rand = "0.8"
2 changes: 1 addition & 1 deletion alvr/dashboard/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ alvr_gui_common.workspace = true

bincode = "1"
chrono = "0.4"
eframe = "0.26"
eframe = "0.27"
env_logger = "0.11"
ico = "0.3"
rand = "0.8"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ impl Control {
};
if response.drag_started() || response.gained_focus() {
self.editing_value_f64 = Some(session_value)
} else if response.drag_released() || response.lost_focus() {
} else if response.drag_stopped() || response.lost_focus() {
request = get_request(&self.nesting_info, *editing_value_mut, self.ty);
*session_fragment = to_json_value(*editing_value_mut, self.ty);

Expand Down
4 changes: 1 addition & 3 deletions alvr/dashboard/src/dashboard/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ use alvr_events::EventType;
use alvr_gui_common::theme;
use alvr_packets::{PathValuePair, ServerRequest};
use alvr_session::SessionConfig;
use eframe::egui::{
self, style::Margin, Align, CentralPanel, Frame, Layout, RichText, SidePanel, Stroke,
};
use eframe::egui::{self, Align, CentralPanel, Frame, Layout, Margin, RichText, SidePanel, Stroke};
use std::{
collections::BTreeMap,
ops::Deref,
Expand Down
2 changes: 1 addition & 1 deletion alvr/gui_common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ license.workspace = true
[dependencies]
alvr_common.workspace = true

egui = "0.26"
egui = "0.27"
24 changes: 18 additions & 6 deletions alvr/launcher/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
[package]
name = "alvr_launcher"
version = "0.1.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
version.workspace = true
edition.workspace = true
rust-version.workspace = true
authors.workspace = true
license.workspace = true

[dependencies]
alvr_common.workspace = true
alvr_gui_common.workspace = true

anyhow = "1"
eframe = "0.26"
eframe = "0.27"
flate2 = "1.0.18"
futures-util = "0.3.28"
ico = "0.3"
open = "5"
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "stream", "json"] }
reqwest = { version = "0.12", default-features = false, features = [
"rustls-tls",
"stream",
"json",
"http2",
] }
serde_json = "1"
tar = "0.4"
tokio = { version = "1", features = ["rt-multi-thread"] }
zip = "0.6"

[target.'cfg(windows)'.build-dependencies]
winres = "0.1"
9 changes: 9 additions & 0 deletions alvr/launcher/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#[cfg(windows)]
fn main() {
let mut resource = winres::WindowsResource::new();
resource.set_icon("../dashboard/resources/dashboard.ico");
resource.compile().unwrap();
}

#[cfg(not(windows))]
fn main() {}
Loading
Loading