openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

we've been using the wrong define for mac detection

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-01-08 11:30:21 -06:00
committed by Celtic Minstrel
parent 747b08ee09
commit 73e85836a3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pcedit/pc.main.cpp
View File

@@ -126,7 +126,7 @@ int main(int argc, char* argv[]) {
init_tiling(); init_tiling();
init_snd_tool(); init_snd_tool();
#ifdef SFML_SYSTEM_MAC #ifdef SFML_SYSTEM_MACOS
init_menubar(); // This is called twice because Windows and Mac have different ordering requirements init_menubar(); // This is called twice because Windows and Mac have different ordering requirements
#endif #endif
@@ -190,7 +190,7 @@ void adjust_window (sf::RenderWindow& mainPtr, sf::View& mainView) {
// Apply view to the main window // Apply view to the main window
mainPtr.setView(mainView); mainPtr.setView(mainView);
#ifndef SFML_SYSTEM_MAC // This overrides Dock icon on OSX, which isn't what we want at all #ifndef SFML_SYSTEM_MACOS // This overrides Dock icon on OSX, which isn't what we want at all
const ImageRsrc& icon = ResMgr::graphics.get("icon", true); const ImageRsrc& icon = ResMgr::graphics.get("icon", true);
mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr()); mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr());
#endif #endif

4
src/scenedit/scen.main.cpp
View File

@@ -180,7 +180,7 @@ void adjust_windows (sf::RenderWindow & mainPtr, sf::View & mainView) {
// Apply view to the main window // Apply view to the main window
mainPtr.setView(mainView); mainPtr.setView(mainView);
#ifndef SFML_SYSTEM_MAC // This overrides Dock icon on OSX, which isn't what we want at all #ifndef SFML_SYSTEM_MACOS // This overrides Dock icon on OSX, which isn't what we want at all
const ImageRsrc& icon = ResMgr::graphics.get("icon", true); const ImageRsrc& icon = ResMgr::graphics.get("icon", true);
mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr()); mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr());
#endif #endif
@@ -226,7 +226,7 @@ void init_scened(int argc, char* argv[]) {
init_shaders(); init_shaders();
init_tiling(); init_tiling();
init_snd_tool(); init_snd_tool();
#ifdef SFML_SYSTEM_MAC #ifdef SFML_SYSTEM_MACOS
init_menubar(); // This is called twice because Windows and Mac have different ordering requirements init_menubar(); // This is called twice because Windows and Mac have different ordering requirements
#endif #endif
mainPtr.clear(sf::Color::Black); mainPtr.clear(sf::Color::Black);

2
src/tools/winutil.hpp
View File

@@ -63,7 +63,7 @@ int getMenubarHeight();
// coordinate space, but on Linux it is. // coordinate space, but on Linux it is.
inline int os_specific_y_offset() { inline int os_specific_y_offset() {
return return
#if defined(SFML_SYSTEM_WINDOWS) || defined(SFML_SYSTEM_MAC) #if defined(SFML_SYSTEM_WINDOWS) || defined(SFML_SYSTEM_MACOS)
0; 0;
#else #else
getMenubarHeight(); getMenubarHeight();