-
Notifications
You must be signed in to change notification settings - Fork 70
Set application icon from within XIVLauncher.Core #364
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
Open
Dormanil
wants to merge
2
commits into
goatcorp:main
Choose a base branch
from
Dormanil:feat/appicon
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |||||||||||||||||||||
| using Config.Net; | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| using Hexa.NET.SDL3; | ||||||||||||||||||||||
| using Hexa.NET.SDL3.Image; | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| using Serilog; | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
|
|
@@ -41,6 +42,7 @@ sealed class Program | |||||||||||||||||||||
| private static string[] mainArgs = []; | ||||||||||||||||||||||
| private static LauncherApp launcherApp = null!; | ||||||||||||||||||||||
| private static unsafe SDLWindow* window = null!; | ||||||||||||||||||||||
| private static unsafe SDLSurface* icon = null!; | ||||||||||||||||||||||
| private static unsafe SDLGPUDevice* gpuDevice = null!; | ||||||||||||||||||||||
| public static unsafe SDLGPUDevice* GPUDevice => gpuDevice; | ||||||||||||||||||||||
| private static ImGuiBindings guiBindings = null!; | ||||||||||||||||||||||
|
|
@@ -287,6 +289,8 @@ private static void Main(string[] args) | |||||||||||||||||||||
| Environment.Exit(1); | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| icon = GetApplicationIcon(); | ||||||||||||||||||||||
| SDL.SetWindowIcon(window, icon); | ||||||||||||||||||||||
| SDL.SetWindowPosition(window, (int)SDL.SDL_WINDOWPOS_CENTERED_MASK, (int)SDL.SDL_WINDOWPOS_CENTERED_MASK); | ||||||||||||||||||||||
| Log.Debug("SDL OK!"); | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
|
|
@@ -336,6 +340,7 @@ private static void Main(string[] args) | |||||||||||||||||||||
| guiBindings.Dispose(); | ||||||||||||||||||||||
| SDL.ReleaseWindowFromGPUDevice(gpuDevice, window); | ||||||||||||||||||||||
| SDL.DestroyGPUDevice(gpuDevice); | ||||||||||||||||||||||
| SDL.DestroySurface(icon); | ||||||||||||||||||||||
| SDL.DestroyWindow(window); | ||||||||||||||||||||||
| SDL.Quit(); | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
|
|
@@ -482,4 +487,30 @@ public static void ClearAll(bool tsbutton = false) | |||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| public static void ResetUIDCache(bool tsbutton = false) => launcherApp.UniqueIdCache.Reset(); | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| private static unsafe SDLSurface* GetApplicationIcon() | ||||||||||||||||||||||
|
Dormanil marked this conversation as resolved.
Outdated
|
||||||||||||||||||||||
| { | ||||||||||||||||||||||
| var logoImage = AppUtil.GetEmbeddedResourceBytes("logo.png").AsMemory(); | ||||||||||||||||||||||
| using var handle = logoImage.Pin(); | ||||||||||||||||||||||
| var tempicon = SDLImage.LoadPNGIO(SDL.IOFromMem(handle.Pointer, (nuint) logoImage.Length)); | ||||||||||||||||||||||
| if (tempicon is null) | ||||||||||||||||||||||
| { | ||||||||||||||||||||||
| Log.Error($"Error: SDL_LoadPNG_IO failed: {SDL.GetErrorS()}"); | ||||||||||||||||||||||
| return SDL.CreateSurface(0,0,SDLPixelFormat.Abgr8888); | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
Comment on lines
+508
to
+513
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||
|
|
||||||||||||||||||||||
| var applicationIcon = SDL.ScaleSurface(tempicon, 512, 512, SDLScaleMode.Linear); | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| // Sizes smaller than 64x64 don't look good on my machine | ||||||||||||||||||||||
| int[] alternateSizes = [64, 96, 128, 256]; | ||||||||||||||||||||||
| foreach(var size in alternateSizes) | ||||||||||||||||||||||
| { | ||||||||||||||||||||||
| var alternateIcon = SDL.ScaleSurface(tempicon, size, size, SDLScaleMode.Linear); | ||||||||||||||||||||||
| SDL.AddSurfaceAlternateImage(applicationIcon, alternateIcon); | ||||||||||||||||||||||
| SDL.DestroySurface(alternateIcon); | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| SDL.DestroySurface(tempicon); | ||||||||||||||||||||||
| return applicationIcon; | ||||||||||||||||||||||
|
Dormanil marked this conversation as resolved.
Outdated
|
||||||||||||||||||||||
| } | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.