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

Don't set application icon on OSX since it overrides the Dock icon

Browse Source
This commit is contained in:
Celtic Minstrel
2015-09-25 00:47:14 -04:00
parent e81b63d36f
commit 088166a534
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/boe.graphics.cpp
View File

@@ -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<ImageRsrc>("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});

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

@@ -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<ImageRsrc>("icon");
mainPtr.setIcon(icon.getSize().x, icon.getSize().y, icon.getPixelsPtr());
#endif
init_menubar();
}

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

@@ -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<ImageRsrc>("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;