Skip to content

Replace sa icon to taskbar #3907

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Dec 30, 2024
Merged

Replace sa icon to taskbar #3907

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11852cb
Update
Moris-Onz Dec 25, 2024
a2543bd
Clean
Moris-Onz Dec 26, 2024
fd6d9b6
Fast
Moris-Onz Dec 26, 2024
73c3815
style
Moris-Onz Dec 26, 2024
c90805e
Merge branch 'master' into replace-icon-taskbar
G-Moris Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Client/core/DXHook/CProxyDirect3D9.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

#include "StdInc.h"
#include <dwmapi.h>
#include <resource.h>

extern HINSTANCE g_hModule;

HRESULT HandleCreateDeviceResult(HRESULT hResult, IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags,
D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DDevice9** ppReturnedDeviceInterface);
Expand Down Expand Up @@ -172,6 +175,23 @@ HRESULT CProxyDirect3D9::CreateDevice(UINT Adapter, D3DDEVTYPE DeviceType, HWND
BOOL darkTitleBar = GetSystemRegistryValue((uint)HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme") == "\x0";
DwmSetWindowAttribute(hFocusWindow, DWMWA_USE_IMMERSIVE_DARK_MODE, &darkTitleBar, sizeof(darkTitleBar));

// Update icon
if (HICON icon = LoadIcon(g_hModule, MAKEINTRESOURCE(IDI_ICON1)))
{
const auto paramIcon = reinterpret_cast<LPARAM>(icon);
for (const WPARAM size : {ICON_SMALL, ICON_BIG})
{
SendMessage(hFocusWindow, WM_SETICON, size, paramIcon);
}

// Clean
DestroyIcon(icon);
}

// Redraw, we avoid possible problems with the fact that it won't replace the icon somewhere
InvalidateRect(hFocusWindow, nullptr, TRUE);
UpdateWindow(hFocusWindow);

// Detect if second call to CreateDevice
if (CreateDeviceSecondCallCheck(hResult, m_pDevice, Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface))
{
Expand Down
Loading