diff --git a/src/boe.graphics.cpp b/src/boe.graphics.cpp index e9b673c0..1158ed80 100644 --- a/src/boe.graphics.cpp +++ b/src/boe.graphics.cpp @@ -177,8 +177,10 @@ void adjust_window_mode() { } r = windRect; } +#ifndef __APPLE__ // This overrides Dock icon on OSX, which isn't what we want at all ImageRsrc& icon = *ResMgr::get("icon"); mainPtr.setIcon(icon.getSize().x, icon.getSize().y, icon.getPixelsPtr()); +#endif redraw_screen(REFRESH_NONE); if(text_sbar) { text_sbar->relocate({ul.x + 546,ul.y + 283}); diff --git a/src/pcedit/pc.main.cpp b/src/pcedit/pc.main.cpp index 9d1e0716..ca5edfa3 100644 --- a/src/pcedit/pc.main.cpp +++ b/src/pcedit/pc.main.cpp @@ -113,8 +113,10 @@ void Initialize(void) { // The window is full screen size, made smaller to make it more visible. int height = 440 + getMenubarHeight(); mainPtr.create(sf::VideoMode(590, height), "Blades of Exile Character Editor", sf::Style::Titlebar | sf::Style::Close); +#ifndef __APPLE__ // This overrides Dock icon on OSX, which isn't what we want at all ImageRsrc& icon = *ResMgr::get("icon"); mainPtr.setIcon(icon.getSize().x, icon.getSize().y, icon.getPixelsPtr()); +#endif init_menubar(); } diff --git a/src/scenedit/scen.main.cpp b/src/scenedit/scen.main.cpp index 4a7be53c..29952e70 100644 --- a/src/scenedit/scen.main.cpp +++ b/src/scenedit/scen.main.cpp @@ -139,8 +139,10 @@ void Initialize(void) { windRect.offset(0,18); mainPtr.create(sf::VideoMode(windRect.width(), windRect.height()), "Blades of Exile Scenario Editor", sf::Style::Titlebar | sf::Style::Close); mainPtr.setPosition(windRect.topLeft()); +#ifndef __APPLE__ // This overrides Dock icon on OSX, which isn't what we want at all ImageRsrc& icon = *ResMgr::get("icon"); mainPtr.setIcon(icon.getSize().x, icon.getSize().y, icon.getPixelsPtr()); +#endif init_menubar(); right_sbar_rect.top = RIGHT_AREA_UL_Y - 1; right_sbar_rect.left = RIGHT_AREA_UL_X + RIGHT_AREA_WIDTH - 1 - 16;