atria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] correct the icon setting

Browse Source
This commit is contained in:
Edouard DUPIN 2015-08-24 22:15:26 +02:00
parent 3653ba1761
commit 33c4783bac
3 changed files with 136 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gale/Application.cpp
View File

@ -120,7 +120,8 @@ std::string gale::Application::getTitle() {
} }
void gale::Application::setIcon(const std::string& _iconFile) { void gale::Application::setIcon(const std::string& _iconFile) {
gale::Context& context = gale::getContext();
context.setIcon(_iconFile);
} }
std::string gale::Application::getIcon() { std::string gale::Application::getIcon() {

7
gale/context/X11/Context.cpp
View File

@ -96,7 +96,9 @@ extern "C" {
} Hints; } Hints;
} }
// TODO : #include <egami/egami.h> #ifdef GALE_BUILD_EGAMI
#include <egami/egami.h>
#endif
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
@ -1060,8 +1062,7 @@ class X11Interface : public gale::Context {
} }
/****************************************************************************************/ /****************************************************************************************/
void setIcon(const std::string& _inputFile) { void setIcon(const std::string& _inputFile) {
// TODO : ... #ifdef GALE_BUILD_EGAMI
#if 0
egami::Image dataImage; egami::Image dataImage;
// load data // load data
if (false == egami::load(dataImage, _inputFile)) { if (false == egami::load(dataImage, _inputFile)) {

2
lutin_gale.py
View File

@ -36,6 +36,8 @@ def create(target):
]) ])
if target.name=="Linux": if target.name=="Linux":
myModule.add_src_file('gale/context/X11/Context.cpp') myModule.add_src_file('gale/context/X11/Context.cpp')
# check if egami is present in the worktree: this is for the icon parsing ...
myModule.add_optionnal_module_depend('egami', ["c++", "-DGALE_BUILD_EGAMI"])
elif target.name=="Windows": elif target.name=="Windows":
myModule.add_src_file('gale/context/Windows/Context.cpp') myModule.add_src_file('gale/context/Windows/Context.cpp')
elif target.name=="Android": elif target.name=="Android":