gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Window Mod TItle, Icon

Browse Source
This commit is contained in:
Ralty
2025-08-07 05:17:06 +07:00
parent 75cc052c7b
commit de41464364
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/system/Flags.hx
+4 -1
View File
@@ -26,8 +26,8 @@ class Flags {
public static var MOD_DOWNLOAD_LINK:String = ""; public static var MOD_DOWNLOAD_LINK:String = "";
public static var MOD_DEPENDENCIES:Array<String> = []; public static var MOD_DEPENDENCIES:Array<String> = [];
@:noCompletion public static var MOD_ICON64:String = "";
@:noCompletion public static var MOD_ICON32:String = ""; @:noCompletion public static var MOD_ICON32:String = "";
@:noCompletion public static var MOD_ICON24:String = "";
@:noCompletion public static var MOD_ICON16:String = ""; @:noCompletion public static var MOD_ICON16:String = "";
public static var MOD_ICON:String = ""; public static var MOD_ICON:String = "";
@@ -46,6 +46,7 @@ class Flags {
public static var COMMIT_HASH:String = GitCommitMacro.commitHash; public static var COMMIT_HASH:String = GitCommitMacro.commitHash;
public static var COMMIT_MESSAGE:String = 'Commit $COMMIT_NUMBER ($COMMIT_HASH)'; public static var COMMIT_MESSAGE:String = 'Commit $COMMIT_NUMBER ($COMMIT_HASH)';
@:bypass public static var WINDOW_TITLE_USE_MOD_NAME:Bool = false;
@:lazy public static var TITLE:String = Application.current.meta.get('name'); @:lazy public static var TITLE:String = Application.current.meta.get('name');
@:lazy public static var VERSION:String = Application.current.meta.get('version'); @:lazy public static var VERSION:String = Application.current.meta.get('version');
@@ -283,6 +284,8 @@ class Flags {
else trace('Invalid section $name'); else trace('Invalid section $name');
} }
} }
WINDOW_TITLE_USE_MOD_NAME = !flags.exists('TITLE');
} }
public static function loadFromDatas(datas:Array<String>) { public static function loadFromDatas(datas:Array<String>) {
source/funkin/backend/system/MainState.hx
+1 -1
View File
@@ -112,7 +112,7 @@ class MainState extends FlxState {
TranslationUtil.setLanguage(Flags.DISABLE_LANGUAGES ? Flags.DEFAULT_LANGUAGE : null); TranslationUtil.setLanguage(Flags.DISABLE_LANGUAGES ? Flags.DEFAULT_LANGUAGE : null);
ModsFolder.onModSwitch.dispatch(ModsFolder.currentModFolder); // Loads global.hx ModsFolder.onModSwitch.dispatch(ModsFolder.currentModFolder); // Loads global.hx
MusicBeatTransition.script = Flags.DEFAULT_TRANSITION_SCRIPT; MusicBeatTransition.script = Flags.DEFAULT_TRANSITION_SCRIPT;
WindowUtils.resetTitle(); WindowUtils.resetAffixes(false);
WindowUtils.setWindow(); WindowUtils.setWindow();
Main.refreshAssets(); Main.refreshAssets();
DiscordUtil.init(); DiscordUtil.init();
source/funkin/backend/utils/WindowUtils.hx
+11 -8
View File
@@ -45,16 +45,17 @@ final class WindowUtils {
* Resets the window title to the application name and resets the prefix and suffix. * Resets the window title to the application name and resets the prefix and suffix.
**/ **/
public static inline function resetTitle() { public static inline function resetTitle() {
title = Flags.TITLE == null ? Lib.application.meta.get('name') : Flags.TITLE; resetAffixes(false);
resetAffixes(); title = Flags.TITLE;
} }
/** /**
* Resets the prefix and suffix. * Resets the prefix and suffix.
* @param update Should it update window title.
**/ **/
public static inline function resetAffixes() { public static inline function resetAffixes(update = true) {
prefix = suffix = ""; prefix = suffix = "";
updateTitle(); if (update) updateTitle();
} }
/** /**
@@ -62,11 +63,13 @@ final class WindowUtils {
* @param title The title to set. * @param title The title to set.
* @param image The image to set as the icon. * @param image The image to set as the icon.
**/ **/
public static inline function setWindow(?name:String, ?image:String) public static inline function setWindow(?title:String, ?image:String)
{ {
if (Flags.MOD_ICON == null && image == null) return; // TODO: Implement ICON SIZES in Flags.
Lib.application.window.setIcon(lime.graphics.Image.fromBytes(Assets.getBytes(Paths.image(image != null ? image : Flags.MOD_ICON)))); WindowUtils.title = title != null ? title : (Flags.WINDOW_TITLE_USE_MOD_NAME ? Flags.MOD_NAME : Flags.TITLE);
title = name != null ? name : Flags.MOD_NAME;
var iconPath = image != null ? image : Flags.MOD_ICON;
if (Assets.exists(Paths.image(iconPath))) Lib.application.window.setIcon(lime.graphics.Image.fromBytes(Assets.getBytes(Paths.image(iconPath))));
} }
/** /**