Sfoglia il codice sorgente

Merge pull request #1 from annes12345678910/patch-2

Patch 2
pull/5425/head
annes 2 mesi fa
committed by GitHub
parent
commit
5ea24aced7
Non sono state trovate chiavi note per questa firma nel database ID Chiave GPG: B5690EEEBB952194
1 ha cambiato i file con 5 aggiunte e 1 eliminazioni
  1. +5
    -1
      src/platforms/rcore_desktop_glfw.c

+ 5
- 1
src/platforms/rcore_desktop_glfw.c Vedi File

@ -101,7 +101,7 @@
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)
#include <unistd.h> // Required for: usleep() #include <unistd.h> // Required for: usleep()
#include "_cocoalayer.h"
//#define GLFW_EXPOSE_NATIVE_COCOA // WARNING: Fails due to type redefinition //#define GLFW_EXPOSE_NATIVE_COCOA // WARNING: Fails due to type redefinition
void *glfwGetCocoaWindow(GLFWwindow* handle); void *glfwGetCocoaWindow(GLFWwindow* handle);
#include "GLFW/glfw3native.h" // Required for: glfwGetCocoaWindow() #include "GLFW/glfw3native.h" // Required for: glfwGetCocoaWindow()
@ -584,6 +584,9 @@ void ClearWindowState(unsigned int flags)
// NOTE 2: Image is scaled by the OS for all required sizes // NOTE 2: Image is scaled by the OS for all required sizes
void SetWindowIcon(Image image) void SetWindowIcon(Image image)
{ {
#ifdef __APPLE__
CocoaSetDockIcon(image.data, image.width, image.height);
#else
if (image.data == NULL) if (image.data == NULL)
{ {
// Revert to the default window icon, pass in an empty image array // Revert to the default window icon, pass in an empty image array
@ -605,6 +608,7 @@ void SetWindowIcon(Image image)
} }
else TRACELOG(LOG_WARNING, "GLFW: Window icon image must be in R8G8B8A8 pixel format"); else TRACELOG(LOG_WARNING, "GLFW: Window icon image must be in R8G8B8A8 pixel format");
} }
#endif
} }
// Set icon for window, multiple images // Set icon for window, multiple images

Caricamento…
Annulla
Salva