Merge pull request #10 from ApTx2012/feat/launch-customization
Sync source to CNB / Sync Git ref (push) Skipped
Axolotl desktop CI / guardrails (push) Canceled after 0s
Axolotl desktop CI / desktop (macos-latest) (push) Canceled after 0s
Axolotl desktop CI / desktop (ubuntu-latest) (push) Canceled after 0s
Axolotl desktop CI / desktop (windows-latest) (push) Canceled after 0s
Axolotl desktop CI / website (push) Canceled after 0s
Rust checks / shear (push) Canceled after 0s
Repository checks / typos (push) Canceled after 0s
Repository checks / tombi (push) Canceled after 0s
Sync source to CNB / Sync Git ref (push) Skipped
Axolotl desktop CI / guardrails (push) Canceled after 0s
Axolotl desktop CI / desktop (macos-latest) (push) Canceled after 0s
Axolotl desktop CI / desktop (ubuntu-latest) (push) Canceled after 0s
Axolotl desktop CI / desktop (windows-latest) (push) Canceled after 0s
Axolotl desktop CI / website (push) Canceled after 0s
Rust checks / shear (push) Canceled after 0s
Repository checks / typos (push) Canceled after 0s
Repository checks / tombi (push) Canceled after 0s
feat: 支持自定义 Minecraft 窗口标题
This commit is contained in:
18 files changed
+290
-5
No files matched your search
@@ -36,24 +36,29 @@ const fullscreenSetting: Ref<boolean> = ref(
|
|||||||
instance.value.force_fullscreen ?? globalSettings.force_fullscreen,
|
instance.value.force_fullscreen ?? globalSettings.force_fullscreen,
|
||||||
)
|
)
|
||||||
const maximizeWindowSetting = ref(instance.value.maximize_window ?? globalSettings.maximize_window)
|
const maximizeWindowSetting = ref(instance.value.maximize_window ?? globalSettings.maximize_window)
|
||||||
|
const windowTitle = ref(instance.value.window_title ?? '')
|
||||||
|
|
||||||
const editInstanceObject = computed(() => {
|
const editInstanceObject = computed(() => {
|
||||||
|
const title = windowTitle.value.trim() ? windowTitle.value.trim() : null
|
||||||
if (!overrideWindowSettings.value) {
|
if (!overrideWindowSettings.value) {
|
||||||
return {
|
return {
|
||||||
force_fullscreen: null,
|
force_fullscreen: null,
|
||||||
maximize_window: null,
|
maximize_window: null,
|
||||||
game_resolution: null,
|
game_resolution: null,
|
||||||
|
// The title is independent of the window-size override checkbox.
|
||||||
|
window_title: title,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
force_fullscreen: fullscreenSetting.value,
|
force_fullscreen: fullscreenSetting.value,
|
||||||
maximize_window: maximizeWindowSetting.value,
|
maximize_window: maximizeWindowSetting.value,
|
||||||
game_resolution: fullscreenSetting.value ? null : resolution.value,
|
game_resolution: fullscreenSetting.value ? null : resolution.value,
|
||||||
|
window_title: title,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
[overrideWindowSettings, resolution, fullscreenSetting, maximizeWindowSetting],
|
[overrideWindowSettings, resolution, fullscreenSetting, maximizeWindowSetting, windowTitle],
|
||||||
async () => {
|
async () => {
|
||||||
await edit(instance.value.id, editInstanceObject.value)
|
await edit(instance.value.id, editInstanceObject.value)
|
||||||
},
|
},
|
||||||
@@ -109,6 +114,18 @@ const messages = defineMessages({
|
|||||||
id: 'instance.settings.tabs.window.height.enter',
|
id: 'instance.settings.tabs.window.height.enter',
|
||||||
defaultMessage: 'Enter height...',
|
defaultMessage: 'Enter height...',
|
||||||
},
|
},
|
||||||
|
windowTitle: {
|
||||||
|
id: 'instance.settings.tabs.window.window-title',
|
||||||
|
defaultMessage: 'Window title',
|
||||||
|
},
|
||||||
|
windowTitleDescription: {
|
||||||
|
id: 'instance.settings.tabs.window.window-title.description',
|
||||||
|
defaultMessage: 'Customize the Minecraft window title. Leave empty to keep the default.',
|
||||||
|
},
|
||||||
|
enterWindowTitle: {
|
||||||
|
id: 'instance.settings.tabs.window.window-title.enter',
|
||||||
|
defaultMessage: 'Enter window title...',
|
||||||
|
},
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -200,5 +217,25 @@ const messages = defineMessages({
|
|||||||
:placeholder="formatMessage(messages.enterHeight)"
|
:placeholder="formatMessage(messages.enterHeight)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="globalSettings.custom_window_title_enabled"
|
||||||
|
class="flex items-center gap-4 justify-between"
|
||||||
|
>
|
||||||
|
<div class="flex flex-col gap-1">
|
||||||
|
<h2 class="m-0 inline-flex items-center gap-2 text-lg font-semibold text-contrast">
|
||||||
|
{{ formatMessage(messages.windowTitle) }}
|
||||||
|
</h2>
|
||||||
|
<p class="m-0">
|
||||||
|
{{ formatMessage(messages.windowTitleDescription) }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<StyledInput
|
||||||
|
id="window-title"
|
||||||
|
v-model="windowTitle"
|
||||||
|
autocomplete="off"
|
||||||
|
type="text"
|
||||||
|
:placeholder="formatMessage(messages.enterWindowTitle)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -38,6 +38,26 @@ const messages = defineMessages({
|
|||||||
id: 'app.settings.defaults.maximize-window.unsupported',
|
id: 'app.settings.defaults.maximize-window.unsupported',
|
||||||
defaultMessage: 'Not supported on this operating system.',
|
defaultMessage: 'Not supported on this operating system.',
|
||||||
},
|
},
|
||||||
|
windowTitleEnabled: {
|
||||||
|
id: 'app.settings.defaults.window-title.enabled',
|
||||||
|
defaultMessage: 'Custom Minecraft window title',
|
||||||
|
},
|
||||||
|
windowTitleEnabledDescription: {
|
||||||
|
id: 'app.settings.defaults.window-title.enabled-description',
|
||||||
|
defaultMessage: 'Allow instances to customize the Minecraft window title.',
|
||||||
|
},
|
||||||
|
defaultWindowTitle: {
|
||||||
|
id: 'app.settings.defaults.window-title.default',
|
||||||
|
defaultMessage: 'Default window title',
|
||||||
|
},
|
||||||
|
defaultWindowTitleDescription: {
|
||||||
|
id: 'app.settings.defaults.window-title.default-description',
|
||||||
|
defaultMessage: 'Used when an instance leaves its window title empty.',
|
||||||
|
},
|
||||||
|
defaultWindowTitlePlaceholder: {
|
||||||
|
id: 'app.settings.defaults.window-title.default-placeholder',
|
||||||
|
defaultMessage: 'Enter default window title...',
|
||||||
|
},
|
||||||
width: { id: 'app.settings.defaults.width', defaultMessage: 'Width' },
|
width: { id: 'app.settings.defaults.width', defaultMessage: 'Width' },
|
||||||
widthDescription: {
|
widthDescription: {
|
||||||
id: 'app.settings.defaults.width-description',
|
id: 'app.settings.defaults.width-description',
|
||||||
@@ -212,6 +232,36 @@ watch(
|
|||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</SettingsRow>
|
</SettingsRow>
|
||||||
|
<SettingsRow>
|
||||||
|
<template #label>
|
||||||
|
<span id="settings-target-defaults-window-title" tabindex="-1">
|
||||||
|
{{ formatMessage(messages.windowTitleEnabled) }}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
<template #description>{{
|
||||||
|
formatMessage(messages.windowTitleEnabledDescription)
|
||||||
|
}}</template>
|
||||||
|
<template #control>
|
||||||
|
<Toggle id="custom-window-title-enabled" v-model="settings.custom_window_title_enabled" />
|
||||||
|
</template>
|
||||||
|
</SettingsRow>
|
||||||
|
<SettingsRow stacked>
|
||||||
|
<template #label>{{ formatMessage(messages.defaultWindowTitle) }}</template>
|
||||||
|
<template #description>{{
|
||||||
|
formatMessage(messages.defaultWindowTitleDescription)
|
||||||
|
}}</template>
|
||||||
|
<template #control>
|
||||||
|
<StyledInput
|
||||||
|
id="default-window-title"
|
||||||
|
v-model="settings.default_window_title"
|
||||||
|
:disabled="!settings.custom_window_title_enabled"
|
||||||
|
autocomplete="off"
|
||||||
|
type="text"
|
||||||
|
:placeholder="formatMessage(messages.defaultWindowTitlePlaceholder)"
|
||||||
|
wrapper-class="w-full"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</SettingsRow>
|
||||||
</SettingsSection>
|
</SettingsSection>
|
||||||
|
|
||||||
<SettingsSection>
|
<SettingsSection>
|
||||||
|
|||||||
+3
@@ -55,6 +55,7 @@ export type GameInstance = {
|
|||||||
force_fullscreen?: boolean
|
force_fullscreen?: boolean
|
||||||
maximize_window?: boolean
|
maximize_window?: boolean
|
||||||
game_resolution?: [number, number]
|
game_resolution?: [number, number]
|
||||||
|
window_title?: string | null
|
||||||
launch_preparation_timeout?: number | null
|
launch_preparation_timeout?: number | null
|
||||||
hooks: Hooks
|
hooks: Hooks
|
||||||
}
|
}
|
||||||
@@ -239,6 +240,8 @@ type AppSettings = {
|
|||||||
force_fullscreen: boolean
|
force_fullscreen: boolean
|
||||||
maximize_window: boolean
|
maximize_window: boolean
|
||||||
game_resolution: [number, number]
|
game_resolution: [number, number]
|
||||||
|
custom_window_title_enabled: boolean
|
||||||
|
default_window_title: string
|
||||||
hide_on_process_start: boolean
|
hide_on_process_start: boolean
|
||||||
enter_lightweight_mode_on_game_launch: boolean
|
enter_lightweight_mode_on_game_launch: boolean
|
||||||
auto_set_java_high_performance_mode: boolean
|
auto_set_java_high_performance_mode: boolean
|
||||||
|
|||||||
@@ -11432,6 +11432,30 @@
|
|||||||
"app.anniversary.banner": {
|
"app.anniversary.banner": {
|
||||||
"message": "Happy {ordinal} Anniversary, Starlight!"
|
"message": "Happy {ordinal} Anniversary, Starlight!"
|
||||||
},
|
},
|
||||||
|
"instance.settings.tabs.window.window-title": {
|
||||||
|
"message": "Window title"
|
||||||
|
},
|
||||||
|
"instance.settings.tabs.window.window-title.description": {
|
||||||
|
"message": "Customize the Minecraft window title. Leave empty to keep the default."
|
||||||
|
},
|
||||||
|
"instance.settings.tabs.window.window-title.enter": {
|
||||||
|
"message": "Enter window title..."
|
||||||
|
},
|
||||||
|
"app.settings.defaults.window-title.enabled": {
|
||||||
|
"message": "Custom Minecraft window title"
|
||||||
|
},
|
||||||
|
"app.settings.defaults.window-title.enabled-description": {
|
||||||
|
"message": "Allow instances to customize the Minecraft window title."
|
||||||
|
},
|
||||||
|
"app.settings.defaults.window-title.default": {
|
||||||
|
"message": "Default window title"
|
||||||
|
},
|
||||||
|
"app.settings.defaults.window-title.default-description": {
|
||||||
|
"message": "Used when an instance does not provide its own title."
|
||||||
|
},
|
||||||
|
"app.settings.defaults.window-title.default-placeholder": {
|
||||||
|
"message": "Enter the default window title..."
|
||||||
|
},
|
||||||
"app.action-bar.announcements": {
|
"app.action-bar.announcements": {
|
||||||
"message": "Announcements"
|
"message": "Announcements"
|
||||||
},
|
},
|
||||||
@@ -11462,4 +11486,4 @@
|
|||||||
"app.remote-announcements.preview-action": {
|
"app.remote-announcements.preview-action": {
|
||||||
"message": "Visit website"
|
"message": "Visit website"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -11352,7 +11352,15 @@
|
|||||||
"app.settings.synced-options.game-settings.value-on": { "message": "开启" },
|
"app.settings.synced-options.game-settings.value-on": { "message": "开启" },
|
||||||
"app.settings.synced-options.game-settings.value-unset": { "message": "选择一个值" },
|
"app.settings.synced-options.game-settings.value-unset": { "message": "选择一个值" },
|
||||||
"app.anniversary.banner": { "message": "Starlight {ordinal} 周年快乐!" },
|
"app.anniversary.banner": { "message": "Starlight {ordinal} 周年快乐!" },
|
||||||
|
"instance.settings.tabs.window.window-title": { "message": "窗口标题" },
|
||||||
|
"instance.settings.tabs.window.window-title.description": { "message": "自定义 Minecraft 窗口标题。留空则使用默认标题。" },
|
||||||
|
"instance.settings.tabs.window.window-title.enter": { "message": "输入窗口标题..." },
|
||||||
|
"app.settings.defaults.window-title.enabled": { "message": "自定义 Minecraft 窗口标题" },
|
||||||
|
"app.settings.defaults.window-title.enabled-description": { "message": "允许实例自定义 Minecraft 窗口标题。" },
|
||||||
|
"app.settings.defaults.window-title.default": { "message": "默认窗口标题" },
|
||||||
|
"app.settings.defaults.window-title.default-description": { "message": "当实例未提供自己的标题时使用。" },
|
||||||
|
"app.settings.defaults.window-title.default-placeholder": { "message": "输入默认窗口标题..." },
|
||||||
"app.action-bar.announcements": { "message": "公告" },
|
"app.action-bar.announcements": { "message": "公告" },
|
||||||
"app.remote-announcements.center-title": { "message": "公告" },
|
"app.remote-announcements.center-title": { "message": "公告" },
|
||||||
"app.remote-announcements.empty": { "message": "暂无公告" }
|
"app.remote-announcements.empty": { "message": "暂无公告" }
|
||||||
}
|
}
|
||||||
@@ -333,6 +333,12 @@ pub struct EditInstance {
|
|||||||
)]
|
)]
|
||||||
pub launch_preparation_timeout: Option<Option<u64>>,
|
pub launch_preparation_timeout: Option<Option<u64>>,
|
||||||
pub hooks: Option<Hooks>,
|
pub hooks: Option<Hooks>,
|
||||||
|
#[serde(
|
||||||
|
default,
|
||||||
|
skip_serializing_if = "Option::is_none",
|
||||||
|
with = "serde_with::rust::double_option"
|
||||||
|
)]
|
||||||
|
pub window_title: Option<Option<String>>,
|
||||||
|
|
||||||
#[serde(
|
#[serde(
|
||||||
default,
|
default,
|
||||||
@@ -531,7 +537,8 @@ fn edit_to_core(edit_instance: EditInstance) -> Result<CoreEditInstance> {
|
|||||||
|| edit_instance.maximize_window.is_some()
|
|| edit_instance.maximize_window.is_some()
|
||||||
|| edit_instance.game_resolution.is_some()
|
|| edit_instance.game_resolution.is_some()
|
||||||
|| edit_instance.launch_preparation_timeout.is_some()
|
|| edit_instance.launch_preparation_timeout.is_some()
|
||||||
|| edit_instance.hooks.is_some();
|
|| edit_instance.hooks.is_some()
|
||||||
|
|| edit_instance.window_title.is_some();
|
||||||
if has_launch_change {
|
if has_launch_change {
|
||||||
Some(InstanceLaunchOverridesPatch {
|
Some(InstanceLaunchOverridesPatch {
|
||||||
player: None,
|
player: None,
|
||||||
@@ -546,6 +553,7 @@ fn edit_to_core(edit_instance: EditInstance) -> Result<CoreEditInstance> {
|
|||||||
launch_preparation_timeout: edit_instance
|
launch_preparation_timeout: edit_instance
|
||||||
.launch_preparation_timeout,
|
.launch_preparation_timeout,
|
||||||
hooks: edit_instance.hooks,
|
hooks: edit_instance.hooks,
|
||||||
|
window_title: edit_instance.window_title,
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
|
|||||||
@@ -253,6 +253,14 @@ impl LightweightMode {
|
|||||||
if payload.maximize_window {
|
if payload.maximize_window {
|
||||||
maximize_minecraft_window(payload.pid).await;
|
maximize_minecraft_window(payload.pid).await;
|
||||||
}
|
}
|
||||||
|
if let Some(title) = payload
|
||||||
|
.window_title
|
||||||
|
.as_ref()
|
||||||
|
.map(|value| value.trim())
|
||||||
|
.filter(|value| !value.is_empty())
|
||||||
|
{
|
||||||
|
rename_minecraft_window(payload.pid, title).await;
|
||||||
|
}
|
||||||
let settings = match theseus::settings::get().await {
|
let settings = match theseus::settings::get().await {
|
||||||
Ok(settings) => settings,
|
Ok(settings) => settings,
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
@@ -332,6 +340,8 @@ struct ProcessEventPayload {
|
|||||||
pid: u32,
|
pid: u32,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
maximize_window: bool,
|
maximize_window: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
window_title: Option<String>,
|
||||||
event: String,
|
event: String,
|
||||||
crashed: Option<bool>,
|
crashed: Option<bool>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@@ -339,7 +349,7 @@ struct ProcessEventPayload {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
|
use std::sync::atomic::{AtomicBool, AtomicIsize, AtomicU32, Ordering};
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
static MAXIMIZE_PROCESS_ID: AtomicU32 = AtomicU32::new(0);
|
static MAXIMIZE_PROCESS_ID: AtomicU32 = AtomicU32::new(0);
|
||||||
@@ -400,6 +410,74 @@ async fn maximize_minecraft_window(pid: u32) {
|
|||||||
|
|
||||||
#[cfg(not(target_os = "windows"))]
|
#[cfg(not(target_os = "windows"))]
|
||||||
async fn maximize_minecraft_window(_pid: u32) {}
|
async fn maximize_minecraft_window(_pid: u32) {}
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
static RENAME_WINDOW_HANDLE: AtomicIsize = AtomicIsize::new(0);
|
||||||
|
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
unsafe extern "system" fn rename_if_owned_by_process(
|
||||||
|
hwnd: windows::Win32::Foundation::HWND,
|
||||||
|
_: windows::Win32::Foundation::LPARAM,
|
||||||
|
) -> windows::core::BOOL {
|
||||||
|
use windows::Win32::UI::WindowsAndMessaging::{
|
||||||
|
GetWindowThreadProcessId, IsWindowVisible,
|
||||||
|
};
|
||||||
|
use windows::core::BOOL;
|
||||||
|
|
||||||
|
let mut window_pid = 0;
|
||||||
|
unsafe { GetWindowThreadProcessId(hwnd, Some(&mut window_pid)) };
|
||||||
|
if window_pid == MAXIMIZE_PROCESS_ID.load(Ordering::Relaxed)
|
||||||
|
&& unsafe { IsWindowVisible(hwnd).as_bool() }
|
||||||
|
{
|
||||||
|
RENAME_WINDOW_HANDLE.store(hwnd.0 as isize, Ordering::Relaxed);
|
||||||
|
return BOOL(0);
|
||||||
|
}
|
||||||
|
BOOL(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
async fn rename_minecraft_window(pid: u32, title: &str) {
|
||||||
|
if pid == 0 || title.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// PCL keeps re-applying the title: FML/Quilt and some mods reset it
|
||||||
|
// while the game boots, so a one-shot rename is not enough.
|
||||||
|
let deadline =
|
||||||
|
tokio::time::Instant::now() + std::time::Duration::from_secs(45);
|
||||||
|
let mut applied = false;
|
||||||
|
loop {
|
||||||
|
let found = {
|
||||||
|
let _guard = MAXIMIZE_WINDOW_ENUMERATION.lock();
|
||||||
|
MAXIMIZE_PROCESS_ID.store(pid, Ordering::Relaxed);
|
||||||
|
RENAME_WINDOW_HANDLE.store(0, Ordering::Relaxed);
|
||||||
|
unsafe {
|
||||||
|
use windows::Win32::Foundation::LPARAM;
|
||||||
|
use windows::Win32::UI::WindowsAndMessaging::EnumWindows;
|
||||||
|
let _ =
|
||||||
|
EnumWindows(Some(rename_if_owned_by_process), LPARAM(0));
|
||||||
|
}
|
||||||
|
RENAME_WINDOW_HANDLE.load(Ordering::Relaxed)
|
||||||
|
};
|
||||||
|
if found != 0 {
|
||||||
|
let hwnd = windows::Win32::Foundation::HWND(found as *mut _);
|
||||||
|
let wide: Vec<u16> = title.encode_utf16().chain(Some(0)).collect();
|
||||||
|
unsafe {
|
||||||
|
use windows::Win32::UI::WindowsAndMessaging::SetWindowTextW;
|
||||||
|
let _ =
|
||||||
|
SetWindowTextW(hwnd, windows::core::PCWSTR(wide.as_ptr()));
|
||||||
|
}
|
||||||
|
applied = true;
|
||||||
|
}
|
||||||
|
if tokio::time::Instant::now() >= deadline {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let _ = applied;
|
||||||
|
tokio::time::sleep(std::time::Duration::from_millis(400)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "windows"))]
|
||||||
|
async fn rename_minecraft_window(_pid: u32, _title: &str) {}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn lightweight_mode_frontend_ready(
|
pub fn lightweight_mode_frontend_ready(
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE settings ADD COLUMN custom_window_title_enabled INTEGER NOT NULL DEFAULT FALSE;
|
||||||
|
ALTER TABLE settings ADD COLUMN default_window_title TEXT NOT NULL DEFAULT 'Minecraft';
|
||||||
@@ -250,6 +250,17 @@ async fn run_credentials(
|
|||||||
.launch_overrides
|
.launch_overrides
|
||||||
.maximize_window
|
.maximize_window
|
||||||
.unwrap_or(settings.maximize_window);
|
.unwrap_or(settings.maximize_window);
|
||||||
|
let window_title = settings
|
||||||
|
.custom_window_title_enabled
|
||||||
|
.then(|| {
|
||||||
|
context
|
||||||
|
.launch_overrides
|
||||||
|
.window_title
|
||||||
|
.clone()
|
||||||
|
.filter(|value| !value.trim().is_empty())
|
||||||
|
.unwrap_or_else(|| settings.default_window_title.clone())
|
||||||
|
})
|
||||||
|
.filter(|value| !value.trim().is_empty());
|
||||||
let env_args = context
|
let env_args = context
|
||||||
.launch_overrides
|
.launch_overrides
|
||||||
.custom_env_vars
|
.custom_env_vars
|
||||||
@@ -319,6 +330,7 @@ async fn run_credentials(
|
|||||||
&memory,
|
&memory,
|
||||||
&resolution,
|
&resolution,
|
||||||
maximize_window,
|
maximize_window,
|
||||||
|
window_title,
|
||||||
credentials,
|
credentials,
|
||||||
post_exit_hook,
|
post_exit_hook,
|
||||||
&context,
|
&context,
|
||||||
|
|||||||
@@ -157,6 +157,7 @@ pub(crate) async fn import_axolotl(
|
|||||||
),
|
),
|
||||||
maximize_window: Some(config.launch_overrides.maximize_window),
|
maximize_window: Some(config.launch_overrides.maximize_window),
|
||||||
game_resolution: Some(config.launch_overrides.game_resolution),
|
game_resolution: Some(config.launch_overrides.game_resolution),
|
||||||
|
window_title: None,
|
||||||
launch_preparation_timeout: Some(
|
launch_preparation_timeout: Some(
|
||||||
config.launch_overrides.launch_preparation_timeout,
|
config.launch_overrides.launch_preparation_timeout,
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -400,6 +400,7 @@ pub async fn emit_process(
|
|||||||
uuid: Uuid,
|
uuid: Uuid,
|
||||||
pid: u32,
|
pid: u32,
|
||||||
maximize_window: bool,
|
maximize_window: bool,
|
||||||
|
window_title: Option<String>,
|
||||||
event: ProcessPayloadType,
|
event: ProcessPayloadType,
|
||||||
message: &str,
|
message: &str,
|
||||||
crashed: Option<bool>,
|
crashed: Option<bool>,
|
||||||
@@ -416,6 +417,7 @@ pub async fn emit_process(
|
|||||||
uuid,
|
uuid,
|
||||||
pid,
|
pid,
|
||||||
maximize_window,
|
maximize_window,
|
||||||
|
window_title,
|
||||||
event,
|
event,
|
||||||
message: message.to_string(),
|
message: message.to_string(),
|
||||||
crashed,
|
crashed,
|
||||||
|
|||||||
@@ -336,6 +336,8 @@ pub struct ProcessPayload {
|
|||||||
pub uuid: Uuid,
|
pub uuid: Uuid,
|
||||||
pub pid: u32,
|
pub pid: u32,
|
||||||
pub maximize_window: bool,
|
pub maximize_window: bool,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub window_title: Option<String>,
|
||||||
pub event: ProcessPayloadType,
|
pub event: ProcessPayloadType,
|
||||||
pub message: String,
|
pub message: String,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
|||||||
@@ -1520,6 +1520,7 @@ pub async fn launch_minecraft(
|
|||||||
memory: &MemorySettings,
|
memory: &MemorySettings,
|
||||||
resolution: &WindowSize,
|
resolution: &WindowSize,
|
||||||
maximize_window: bool,
|
maximize_window: bool,
|
||||||
|
window_title: Option<String>,
|
||||||
credentials: &Credentials,
|
credentials: &Credentials,
|
||||||
post_exit_hook: Option<String>,
|
post_exit_hook: Option<String>,
|
||||||
context: &InstanceLaunchContext,
|
context: &InstanceLaunchContext,
|
||||||
@@ -2391,6 +2392,7 @@ pub async fn launch_minecraft(
|
|||||||
command,
|
command,
|
||||||
post_exit_hook,
|
post_exit_hook,
|
||||||
maximize_window,
|
maximize_window,
|
||||||
|
window_title,
|
||||||
instance_path.clone(),
|
instance_path.clone(),
|
||||||
logs_folder,
|
logs_folder,
|
||||||
version_info.logging.is_some(),
|
version_info.logging.is_some(),
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ pub struct InstanceLaunchOverridesPatch {
|
|||||||
skip_serializing_if = "Option::is_none",
|
skip_serializing_if = "Option::is_none",
|
||||||
with = "serde_with::rust::double_option"
|
with = "serde_with::rust::double_option"
|
||||||
)]
|
)]
|
||||||
|
pub window_title: Option<Option<String>>,
|
||||||
|
#[serde(
|
||||||
|
default,
|
||||||
|
skip_serializing_if = "Option::is_none",
|
||||||
|
with = "serde_with::rust::double_option"
|
||||||
|
)]
|
||||||
pub launch_preparation_timeout: Option<Option<u64>>,
|
pub launch_preparation_timeout: Option<Option<u64>>,
|
||||||
pub hooks: Option<Hooks>,
|
pub hooks: Option<Hooks>,
|
||||||
}
|
}
|
||||||
@@ -371,6 +377,10 @@ fn apply_launch_overrides_patch(
|
|||||||
if let Some(game_resolution) = patch.game_resolution {
|
if let Some(game_resolution) = patch.game_resolution {
|
||||||
overrides.game_resolution = game_resolution;
|
overrides.game_resolution = game_resolution;
|
||||||
}
|
}
|
||||||
|
if let Some(window_title) = patch.window_title {
|
||||||
|
overrides.window_title =
|
||||||
|
window_title.filter(|value| !value.trim().is_empty());
|
||||||
|
}
|
||||||
if let Some(mode) = patch.instance_mode {
|
if let Some(mode) = patch.instance_mode {
|
||||||
overrides.instance_mode = Some(mode);
|
overrides.instance_mode = Some(mode);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,6 +38,8 @@ pub struct InstanceLaunchOverrides {
|
|||||||
pub maximize_window: Option<bool>,
|
pub maximize_window: Option<bool>,
|
||||||
pub game_resolution: Option<WindowSize>,
|
pub game_resolution: Option<WindowSize>,
|
||||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub window_title: Option<String>,
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
pub launch_preparation_timeout: Option<u64>,
|
pub launch_preparation_timeout: Option<u64>,
|
||||||
pub hooks: Hooks,
|
pub hooks: Hooks,
|
||||||
}
|
}
|
||||||
@@ -55,6 +57,7 @@ impl InstanceLaunchOverrides {
|
|||||||
force_fullscreen: None,
|
force_fullscreen: None,
|
||||||
maximize_window: None,
|
maximize_window: None,
|
||||||
game_resolution: None,
|
game_resolution: None,
|
||||||
|
window_title: None,
|
||||||
launch_preparation_timeout: None,
|
launch_preparation_timeout: None,
|
||||||
hooks: Hooks {
|
hooks: Hooks {
|
||||||
pre_launch: None,
|
pre_launch: None,
|
||||||
@@ -86,6 +89,8 @@ pub(crate) struct InstanceLaunchOverridesData {
|
|||||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
pub game_resolution: Option<WindowSize>,
|
pub game_resolution: Option<WindowSize>,
|
||||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub window_title: Option<String>,
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
pub launch_preparation_timeout: Option<u64>,
|
pub launch_preparation_timeout: Option<u64>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub hooks: Hooks,
|
pub hooks: Hooks,
|
||||||
@@ -107,6 +112,7 @@ impl InstanceLaunchOverridesData {
|
|||||||
force_fullscreen: self.force_fullscreen,
|
force_fullscreen: self.force_fullscreen,
|
||||||
maximize_window: self.maximize_window,
|
maximize_window: self.maximize_window,
|
||||||
game_resolution: self.game_resolution,
|
game_resolution: self.game_resolution,
|
||||||
|
window_title: self.window_title,
|
||||||
launch_preparation_timeout: self.launch_preparation_timeout,
|
launch_preparation_timeout: self.launch_preparation_timeout,
|
||||||
hooks: self.hooks,
|
hooks: self.hooks,
|
||||||
}
|
}
|
||||||
@@ -125,6 +131,7 @@ impl From<&InstanceLaunchOverrides> for InstanceLaunchOverridesData {
|
|||||||
force_fullscreen: overrides.force_fullscreen,
|
force_fullscreen: overrides.force_fullscreen,
|
||||||
maximize_window: overrides.maximize_window,
|
maximize_window: overrides.maximize_window,
|
||||||
game_resolution: overrides.game_resolution,
|
game_resolution: overrides.game_resolution,
|
||||||
|
window_title: overrides.window_title.clone(),
|
||||||
launch_preparation_timeout: overrides.launch_preparation_timeout,
|
launch_preparation_timeout: overrides.launch_preparation_timeout,
|
||||||
hooks: overrides.hooks.clone(),
|
hooks: overrides.hooks.clone(),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -621,6 +621,7 @@ where
|
|||||||
force_fullscreen: input.force_fullscreen,
|
force_fullscreen: input.force_fullscreen,
|
||||||
maximize_window: None,
|
maximize_window: None,
|
||||||
game_resolution: input.game_resolution,
|
game_resolution: input.game_resolution,
|
||||||
|
window_title: None,
|
||||||
launch_preparation_timeout: None,
|
launch_preparation_timeout: None,
|
||||||
hooks: input.hooks,
|
hooks: input.hooks,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -312,6 +312,7 @@ impl ProcessManager {
|
|||||||
mut mc_command: Command,
|
mut mc_command: Command,
|
||||||
post_exit_command: Option<String>,
|
post_exit_command: Option<String>,
|
||||||
maximize_window: bool,
|
maximize_window: bool,
|
||||||
|
window_title: Option<String>,
|
||||||
game_dir: PathBuf,
|
game_dir: PathBuf,
|
||||||
logs_folder: PathBuf,
|
logs_folder: PathBuf,
|
||||||
xml_logging: bool,
|
xml_logging: bool,
|
||||||
@@ -336,6 +337,7 @@ impl ProcessManager {
|
|||||||
uuid: Uuid::new_v4(),
|
uuid: Uuid::new_v4(),
|
||||||
pid: mc_proc.id().unwrap_or_default(),
|
pid: mc_proc.id().unwrap_or_default(),
|
||||||
maximize_window,
|
maximize_window,
|
||||||
|
window_title: window_title.clone(),
|
||||||
start_time: Utc::now(),
|
start_time: Utc::now(),
|
||||||
instance_id: instance_id.to_string(),
|
instance_id: instance_id.to_string(),
|
||||||
instance_path: instance_path.to_string(),
|
instance_path: instance_path.to_string(),
|
||||||
@@ -509,6 +511,7 @@ impl ProcessManager {
|
|||||||
metadata.uuid,
|
metadata.uuid,
|
||||||
metadata.pid,
|
metadata.pid,
|
||||||
metadata.maximize_window,
|
metadata.maximize_window,
|
||||||
|
metadata.window_title.clone(),
|
||||||
ProcessPayloadType::Launched,
|
ProcessPayloadType::Launched,
|
||||||
"Launched Minecraft",
|
"Launched Minecraft",
|
||||||
None,
|
None,
|
||||||
@@ -586,6 +589,7 @@ pub struct ProcessMetadata {
|
|||||||
pub uuid: Uuid,
|
pub uuid: Uuid,
|
||||||
pub pid: u32,
|
pub pid: u32,
|
||||||
pub maximize_window: bool,
|
pub maximize_window: bool,
|
||||||
|
pub window_title: Option<String>,
|
||||||
pub instance_id: String,
|
pub instance_id: String,
|
||||||
pub instance_path: String,
|
pub instance_path: String,
|
||||||
pub instance_name: String,
|
pub instance_name: String,
|
||||||
@@ -1311,6 +1315,7 @@ impl Process {
|
|||||||
uuid,
|
uuid,
|
||||||
pid,
|
pid,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
ProcessPayloadType::Finished,
|
ProcessPayloadType::Finished,
|
||||||
"Exited process",
|
"Exited process",
|
||||||
Some(!mc_exit_status.success() && !manually_killed),
|
Some(!mc_exit_status.success() && !manually_killed),
|
||||||
@@ -1451,6 +1456,7 @@ mod post_upgrade_tests {
|
|||||||
uuid,
|
uuid,
|
||||||
pid: child.id().unwrap(),
|
pid: child.id().unwrap(),
|
||||||
maximize_window: false,
|
maximize_window: false,
|
||||||
|
window_title: None,
|
||||||
instance_id: "first".into(),
|
instance_id: "first".into(),
|
||||||
instance_path: "first".into(),
|
instance_path: "first".into(),
|
||||||
instance_name: "First".into(),
|
instance_name: "First".into(),
|
||||||
|
|||||||
@@ -176,6 +176,10 @@ pub struct Settings {
|
|||||||
pub force_fullscreen: bool,
|
pub force_fullscreen: bool,
|
||||||
pub maximize_window: bool,
|
pub maximize_window: bool,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
|
pub custom_window_title_enabled: bool,
|
||||||
|
#[serde(default = "default_window_title")]
|
||||||
|
pub default_window_title: String,
|
||||||
|
#[serde(default)]
|
||||||
pub force_unicode_font: bool,
|
pub force_unicode_font: bool,
|
||||||
pub game_resolution: WindowSize,
|
pub game_resolution: WindowSize,
|
||||||
pub hide_on_process_start: bool,
|
pub hide_on_process_start: bool,
|
||||||
@@ -198,6 +202,10 @@ pub struct Settings {
|
|||||||
pub version: usize,
|
pub version: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn default_window_title() -> String {
|
||||||
|
"Minecraft".to_string()
|
||||||
|
}
|
||||||
|
|
||||||
fn default_true() -> bool {
|
fn default_true() -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
@@ -328,6 +336,16 @@ impl Settings {
|
|||||||
)
|
)
|
||||||
.fetch_one(exec)
|
.fetch_one(exec)
|
||||||
.await?;
|
.await?;
|
||||||
|
let custom_window_title_enabled: bool = sqlx::query_scalar(
|
||||||
|
"SELECT custom_window_title_enabled FROM settings WHERE id = 0",
|
||||||
|
)
|
||||||
|
.fetch_one(exec)
|
||||||
|
.await?;
|
||||||
|
let default_window_title: String = sqlx::query_scalar(
|
||||||
|
"SELECT default_window_title FROM settings WHERE id = 0",
|
||||||
|
)
|
||||||
|
.fetch_one(exec)
|
||||||
|
.await?;
|
||||||
let settings = Self {
|
let settings = Self {
|
||||||
max_concurrent_downloads: res.max_concurrent_downloads as usize,
|
max_concurrent_downloads: res.max_concurrent_downloads as usize,
|
||||||
max_concurrent_writes: res.max_concurrent_writes as usize,
|
max_concurrent_writes: res.max_concurrent_writes as usize,
|
||||||
@@ -415,6 +433,8 @@ impl Settings {
|
|||||||
},
|
},
|
||||||
force_fullscreen: res.mc_force_fullscreen == 1,
|
force_fullscreen: res.mc_force_fullscreen == 1,
|
||||||
maximize_window: res.mc_maximize_window == 1,
|
maximize_window: res.mc_maximize_window == 1,
|
||||||
|
custom_window_title_enabled,
|
||||||
|
default_window_title,
|
||||||
force_unicode_font: sqlx::query_scalar(
|
force_unicode_font: sqlx::query_scalar(
|
||||||
"SELECT mc_force_unicode_font FROM settings WHERE id = 0",
|
"SELECT mc_force_unicode_font FROM settings WHERE id = 0",
|
||||||
)
|
)
|
||||||
@@ -663,6 +683,18 @@ impl Settings {
|
|||||||
.bind(self.ignore_ssl_errors)
|
.bind(self.ignore_ssl_errors)
|
||||||
.execute(exec)
|
.execute(exec)
|
||||||
.await?;
|
.await?;
|
||||||
|
sqlx::query(
|
||||||
|
"UPDATE settings SET custom_window_title_enabled = ? WHERE id = 0",
|
||||||
|
)
|
||||||
|
.bind(self.custom_window_title_enabled)
|
||||||
|
.execute(exec)
|
||||||
|
.await?;
|
||||||
|
sqlx::query(
|
||||||
|
"UPDATE settings SET default_window_title = ? WHERE id = 0",
|
||||||
|
)
|
||||||
|
.bind(self.default_window_title.trim())
|
||||||
|
.execute(exec)
|
||||||
|
.await?;
|
||||||
sqlx::query("UPDATE settings SET mc_memory_optimize = ? WHERE id = 0")
|
sqlx::query("UPDATE settings SET mc_memory_optimize = ? WHERE id = 0")
|
||||||
.bind(self.memory.optimize_before_launch)
|
.bind(self.memory.optimize_before_launch)
|
||||||
.execute(exec)
|
.execute(exec)
|
||||||
|
|||||||
Reference in new issue
Block a user