From c805fa8f7eb99a77b29678bd7e4cb57c486cf013 Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Mon, 8 Apr 2024 02:09:40 +0200 Subject: Simplify and remove linter's choking hazard windowmanager.cpp(456, 9): Incorrect align on long parameter list in front of 'SetClassLongPtr', it should be aligen in column 25. [RULE_4_1_C_align_long_function_parameter_list] --- src/gui/windowmanager.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index 346013639..e0172cca5 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -448,22 +448,21 @@ void WindowManager::setIcon() icon = LoadIcon(GetModuleHandle(nullptr), "A"); } - if (icon) - { -#ifdef WIN64 + #ifdef USE_SDL2 - SetClassLongPtr(pInfo.info.win.window, + const HWND& windowRef = pInfo.info.win.window; #else - SetClassLongPtr(pInfo.window, + const HWND& windowRef = pInfo.window; #endif // USE_SDL2 + + if (icon) + { +#ifdef WIN64 + SetClassLongPtr(windowRef, GCLP_HICON, reinterpret_cast(icon)); #else // WIN64 -#ifdef USE_SDL2 - SetClassLong(pInfo.info.win.window, -#else - SetClassLong(pInfo.window, -#endif // USE_SDL2 + SetClassLong(windowRef, GCL_HICON, reinterpret_cast(icon)); #endif // WIN64 -- cgit v1.2.3-60-g2f50