Add an icon to the game window. It works for me on Windows 8.1 and for @Imarok on Windows and Linux. Also this change should be tested on all supported platforms (Windows, Linux, macOS) by someone else too.
Before:
After:
Details
Details
- Reviewers
ffffffff s0600204 - Group Reviewers
Restricted Owners Package (Owns No Changed Paths) - Commits
- rP20067: Add an icon to pyrogenesis' application window
- Trac Tickets
- #4363
- Apply patch and compile the game
- Run game
- Test that the icon looks ok
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Lint
Lint Skipped - Unit
Unit Tests Skipped - Build Status
Buildable 2791 Build 4784: Vulcan Build Jenkins
Event Timeline
Comment Actions
Build is green
Updating workspaces. Build (release)... Build (debug)... Running release tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
http://jw:8080/job/phabricator/1799/ for more details.
| source/ps/VideoMode.cpp | ||
|---|---|---|
| 270 | We don't have TEX_RGB. | |
Comment Actions
Window icon (PNG, 128x128):
Should be at the art/textures/icons/window.png. Thanks to @s0600204 for the remind to attach.
Comment Actions
Initially (before @vladislavbelov attached the icon image file separately) this patch caused crash on pyrogenesis start for me:
tex_codec.cpp(70): Function call failed: return value was -120101 (Unknown error (-120101, 0xFFFFFFFFFFFE2ADB)) Function call failed: return value was -120101 (Unknown error (-120101, 0xFFFFFFFFFFFE2ADB)) Location: tex_codec.cpp:70 (tex_codec_for_header)
This seems to be down to arc not acquiring the new image from phabricator properly, causing the image file to... not be an image file.
Also note that if the image doesn't exist at all, I get a different error message:
terminate called after throwing an instance of 'PSERROR_System_VmodeFailed' what(): System_VmodeFailed Aborted (core dumped)
After manually copying the attached image into the appropriate location, the patch works fine (Arch Linux).
However, the fact that 0ad crashes at start if the image file doesn't exist or isn't an image concerns me.
Comment Actions
Works on Ubuntu Gnome, but is quite small.
Looks ok, when cutting all the unused space away (I removed the borders, so that its 128x128)
Comment Actions
Also note that if the image doesn't exist at all, I get a different error message:
terminate called after throwing an instance of 'PSERROR_System_VmodeFailed' what(): System_VmodeFailed Aborted (core dumped)After manually copying the attached image into the appropriate location, the patch works fine (Arch Linux).
However, the fact that 0ad crashes at start if the image file doesn't exist or isn't an image concerns me.
this is true we should add seperate function to load that file, that can fail but sdl init can continue
Comment Actions
Build is green
Updating workspaces. Build (release)... Build (debug)... Running release tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
http://jw:8080/job/phabricator/1856/ for more details.