omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix android compile, fix windows system info log, implement touch/stylus events on windows

Browse Source
This commit is contained in:
omigamedev
2018-10-08 21:13:44 +02:00
parent 365af43891
commit dba5eef824
9 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app_events.cpp
View File

@@ -3,7 +3,7 @@
#ifdef __ANDROID__
void displayKeyboard(android_app* mApplication, bool pShow);
void pick_file(android_app* mApplication, std::function<void(std::string)> callback);
void android_pick_file(android_app* mApplication, std::function<void(std::string)> callback);
#elif _WIN32
std::string win32_open_file(const char* filter);
std::string win32_open_dir();
@@ -63,7 +63,7 @@ void App::pick_image(std::function<void(std::string path)> callback)
callback(path);
});
#elif __ANDROID__
pick_file(and_app, callback);
android_pick_file(and_app, callback);
#elif _WIN32
std::string path = win32_open_file("Image Files (*.jpg, *.png)\0*.jpg;*.png");
if (!path.empty())
@@ -88,7 +88,7 @@ void App::pick_file(std::vector<std::string> types, std::function<void (std::str
callback(path);
});
#elif __ANDROID__
pick_file(and_app, callback);
//android_pick_file(and_app, callback);
#elif _WIN32
std::string filter = "Image Files (";
bool first_type = true;