oiupoyt/OneLauncher-Cracked
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

fix: cluster settings not inheriting value from global memory field (#804)

Browse source
This commit is contained in:
Maciek 2026-09-12 23:39:06 +02:00 • committed by GitHub
parent 0785e58d07
commit 4932b61a72
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/oneclient_app/src/components/memory_field.rs
View file

@ -4,14 +4,17 @@ use crate::components::{Dropdown, TextInput, validate_memory};
use crate::theme::colors;
use crate::utils::{format_memory_gb, memory_presets_mb};
const UNSET_LABEL: &str = "Default";
const CUSTOM_LABEL: &str = "Custom";
/// Presets picker with an input for memory allocation
pub fn memory_field(mut memory: State<String>) -> impl IntoElement {
pub fn memory_field(
mut memory: State<String>,
unset_label: &str,
placeholder: u32,
) -> impl IntoElement {
let presets = memory_presets_mb();
let selected = match memory.read().trim() {
"" => UNSET_LABEL.to_string(),
"" => unset_label.to_string(),
value => value
.parse::<u32>()
.ok()
@ -20,7 +23,8 @@ pub fn memory_field(mut memory: State<String>) -> impl IntoElement {
.unwrap_or_else(|| CUSTOM_LABEL.to_string()),
};
let options: Vec<String> = presets.iter().copied().map(format_memory_gb).collect();
let mut options: Vec<String> = vec![unset_label.to_string()];
options.extend(presets.iter().copied().map(format_memory_gb));
rect()
.horizontal()
@ -31,7 +35,9 @@ pub fn memory_field(mut memory: State<String>) -> impl IntoElement {
.width(Size::px(100.))
.height(Size::px(34.))
.on_select(move |idx: usize| {
if let Some(mb) = presets.get(idx).copied() {
if idx == 0 {
memory.set(String::new());
} else if let Some(mb) = presets.get(idx - 1).copied() {
memory.set(mb.to_string());
}
}),
@ -39,7 +45,7 @@ pub fn memory_field(mut memory: State<String>) -> impl IntoElement {
.child(
TextInput::new(memory)
.width(Size::px(90.))
.placeholder(oneclient_common::default_mem_max().to_string())
.placeholder(placeholder.to_string())
.on_validate(validate_memory)
.trailing(
label()

10
packages/oneclient_app/src/view/app/cluster/cluster_settings.rs
View file

@ -357,8 +357,8 @@ impl Component for MemoryRow {
let overridden = self.value.is_some();
let dispatch = use_dispatch();
let global = self.global.to_string();
let initial = self.value.unwrap_or(self.global).to_string();
let global = self.global;
let initial = self.value.map(|v| v.to_string()).unwrap_or_default();
let mut memory = use_state({
let v = initial.clone();
move || v
@ -387,13 +387,13 @@ impl Component for MemoryRow {
}
let on_reset: EventHandler<()> = (move |()| {
last.set(global.clone());
memory.set(global.clone());
last.set(String::new());
memory.set(String::new());
dispatch.update_cluster_profile(cluster_id, clear_update(Field::MemMax));
})
.into();
let control = memory_field(memory);
let control = memory_field(memory, "Global", global);
settings_row(
IconType::Database01,

2
packages/oneclient_app/src/view/app/settings/minecraft.rs
View file

@ -105,7 +105,7 @@ impl Component for SettingsMinecraft {
IconType::Database01,
"Memory",
"The amount of memory in megabytes allocated for the game. Presets leave 2 GB for the system.",
memory_field(memory),
memory_field(memory, "Default", oneclient_common::default_mem_max()),
))
.child(settings_row(
IconType::Terminal,

4
packages/oneclient_cluster/src/profiles.rs
View file

@ -76,9 +76,7 @@ pub async fn create_profile_from_global(
let mut profile = global.clone();
profile.name = name.to_string();
if let Some(mem) = mem_max {
profile.mem_max = Some(mem);
}
profile.mem_max = mem_max;
if let Some(fullscreen) = force_fullscreen {
profile.force_fullscreen = Some(fullscreen);