diff --git a/client/Cargo.toml b/client/Cargo.toml index c132649..27de2f7 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -4,7 +4,7 @@ path = "src/main.rs" [package] name = "lesavka_client" -version = "0.11.36" +version = "0.11.37" edition = "2024" [dependencies] diff --git a/client/src/launcher/device_test.rs b/client/src/launcher/device_test.rs index 2184adf..f73616c 100644 --- a/client/src/launcher/device_test.rs +++ b/client/src/launcher/device_test.rs @@ -11,8 +11,8 @@ use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; use std::sync::{Arc, Mutex}; use std::time::Duration; -const CAMERA_PREVIEW_WIDTH: i32 = 192; -const CAMERA_PREVIEW_HEIGHT: i32 = 108; +const CAMERA_PREVIEW_WIDTH: i32 = 128; +const CAMERA_PREVIEW_HEIGHT: i32 = 72; const CAMERA_PREVIEW_IDLE: &str = "Select a webcam and click Start Preview."; const MIC_MONITOR_RATE: i32 = 16_000; const MIC_MONITOR_CHANNELS: i32 = 1; diff --git a/client/src/launcher/ui_components.rs b/client/src/launcher/ui_components.rs index e5d6897..8808b96 100644 --- a/client/src/launcher/ui_components.rs +++ b/client/src/launcher/ui_components.rs @@ -111,10 +111,11 @@ const LESAVKA_ICON_SEARCH_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/ass const LAUNCHER_DEFAULT_WIDTH: i32 = 1380; const LAUNCHER_DEFAULT_HEIGHT: i32 = 860; const OPERATIONS_RAIL_WIDTH: i32 = 288; -const CAMERA_PREVIEW_VIEWPORT_HEIGHT: i32 = 108; -const CAMERA_PREVIEW_VIEWPORT_WIDTH: i32 = 192; -const DEVICE_PANEL_HEIGHT: i32 = 236; -const SIDE_LOG_HEIGHT: i32 = 132; +const CAMERA_PREVIEW_VIEWPORT_HEIGHT: i32 = 72; +const CAMERA_PREVIEW_VIEWPORT_WIDTH: i32 = 128; +const DEVICE_PANEL_HEIGHT: i32 = 228; +const DEVICE_TEST_GROUP_HEIGHT: i32 = 188; +const SIDE_LOG_HEIGHT: i32 = 124; pub fn build_launcher_view( app: >k::Application, @@ -334,6 +335,7 @@ pub fn build_launcher_view( testing_row.set_hexpand(true); testing_row.set_vexpand(false); testing_row.set_valign(gtk::Align::Start); + testing_row.set_size_request(-1, DEVICE_TEST_GROUP_HEIGHT); let camera_preview = gtk::Picture::new(); camera_preview.set_can_shrink(false); camera_preview.set_hexpand(false); @@ -371,6 +373,7 @@ pub fn build_launcher_view( webcam_group.set_hexpand(true); webcam_group.set_vexpand(false); webcam_group.set_valign(gtk::Align::Start); + webcam_group.set_size_request(-1, DEVICE_TEST_GROUP_HEIGHT); webcam_group.append(&camera_preview_shell); testing_row.append(&webcam_group); @@ -378,18 +381,19 @@ pub fn build_launcher_view( playback_group.set_hexpand(false); playback_group.set_vexpand(false); playback_group.set_valign(gtk::Align::Start); - playback_group.set_size_request(72, -1); + playback_group.set_size_request(72, DEVICE_TEST_GROUP_HEIGHT); let playback_body = gtk::Box::new(gtk::Orientation::Vertical, 6); playback_body.set_halign(gtk::Align::Center); - playback_body.set_vexpand(false); + playback_body.set_vexpand(true); + playback_body.set_valign(gtk::Align::Fill); let microphone_replay_button = gtk::Button::with_label("Replay"); stabilize_button(µphone_replay_button, 70); audio_check_meter.set_orientation(gtk::Orientation::Vertical); audio_check_meter.set_inverted(true); audio_check_meter.set_hexpand(false); - audio_check_meter.set_vexpand(false); + audio_check_meter.set_vexpand(true); audio_check_meter.set_halign(gtk::Align::Center); - audio_check_meter.set_size_request(20, CAMERA_PREVIEW_VIEWPORT_HEIGHT - 28); + audio_check_meter.set_size_request(20, 0); audio_check_meter.set_show_text(false); audio_check_meter.set_text(Some("Idle")); playback_body.append(&audio_check_meter); diff --git a/common/Cargo.toml b/common/Cargo.toml index c79192d..26dab39 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lesavka_common" -version = "0.11.36" +version = "0.11.37" edition = "2024" build = "build.rs" diff --git a/common/src/cli.rs b/common/src/cli.rs index 4286b96..a69170c 100644 --- a/common/src/cli.rs +++ b/common/src/cli.rs @@ -17,6 +17,6 @@ mod tests { #[test] fn banner_includes_version() { - assert_eq!(banner("0.11.36"), "lesavka-common CLI (v0.11.36)"); + assert_eq!(banner("0.11.37"), "lesavka-common CLI (v0.11.37)"); } } diff --git a/server/Cargo.toml b/server/Cargo.toml index ef73e30..8102ca9 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -10,7 +10,7 @@ bench = false [package] name = "lesavka_server" -version = "0.11.36" +version = "0.11.37" edition = "2024" autobins = false