diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-03-23 11:31:03 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-03-23 11:31:23 -0300 |
commit | 7ad7f2f6a986fa6598ae10f2bb940e15c3658f44 (patch) | |
tree | f8019c0ab73f7a2eb9088429ec6e3673d299f95d /platform/android | |
parent | 393e5605c9e1b5baa91bff9ad61c7a0118b10cac (diff) |
android fixes, please test
(can' t build android atm)
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/dir_access_jandroid.cpp | 6 | ||||
-rw-r--r-- | platform/android/dir_access_jandroid.h | 1 | ||||
-rw-r--r-- | platform/android/os_android.cpp | 5 | ||||
-rw-r--r-- | platform/android/os_android.h | 2 |
4 files changed, 14 insertions, 0 deletions
diff --git a/platform/android/dir_access_jandroid.cpp b/platform/android/dir_access_jandroid.cpp index fda4ca7357..97c5bfed61 100644 --- a/platform/android/dir_access_jandroid.cpp +++ b/platform/android/dir_access_jandroid.cpp @@ -105,6 +105,12 @@ bool DirAccessJAndroid::current_is_dir() const{ return true; } + +bool DirAccessJAndroid::current_is_hidden() const { + + return current!="." && current!=".." && current.begins_with("."); +} + bool DirAccessAndroid::current_is_hidden() const{ return current!="." && current!=".." && current.begins_with("."); } diff --git a/platform/android/dir_access_jandroid.h b/platform/android/dir_access_jandroid.h index 958ea34891..0a696506e6 100644 --- a/platform/android/dir_access_jandroid.h +++ b/platform/android/dir_access_jandroid.h @@ -60,6 +60,7 @@ public: virtual bool list_dir_begin(); ///< This starts dir listing virtual String get_next(); virtual bool current_is_dir() const; + virtual bool current_is_hidden() const; virtual void list_dir_end(); ///< virtual int get_drive_count(); diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 6b91c01dfc..f00e9c2d77 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -291,6 +291,11 @@ void OS_Android::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) p_list->push_back(default_videomode); } +Size2 OS_Android::get_window_size() const { + + return Vector2(default_videomode.width,default_videomode.height); +} + String OS_Android::get_name() { return "Android"; diff --git a/platform/android/os_android.h b/platform/android/os_android.h index 26dbf4a509..bea5371bbc 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -170,6 +170,8 @@ public: virtual VideoMode get_video_mode(int p_screen=0) const; virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const; + virtual Size2 get_window_size() const; + virtual String get_name(); virtual MainLoop *get_main_loop() const; |