maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #11316 from neikeq/aaaaah

Browse source 
Adds _OS::PowerState enum
This commit is contained in:
Ignacio Etcheverry 2017-09-16 12:51:04 +02:00 committed by GitHub
parent 62cb43bb8d f1f8fd1b68
commit 9c71b7b91f
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/bind/core_bind.cpp
View file

@ -440,8 +440,8 @@ bool _OS::is_vsync_enabled() const {
return OS::get_singleton()->is_vsync_enabled();
}
OS::PowerState _OS::get_power_state() {
return OS::get_singleton()->get_power_state();
_OS::PowerState _OS::get_power_state() {
return _OS::PowerState(OS::get_singleton()->get_power_state());
}
int _OS::get_power_seconds_left() {
@ -1142,11 +1142,11 @@ void _OS::_bind_methods() {
BIND_ENUM_CONSTANT(SYSTEM_DIR_PICTURES);
BIND_ENUM_CONSTANT(SYSTEM_DIR_RINGTONES);
BIND_ENUM_CONSTANT(OS::POWERSTATE_UNKNOWN);
BIND_ENUM_CONSTANT(OS::POWERSTATE_ON_BATTERY);
BIND_ENUM_CONSTANT(OS::POWERSTATE_NO_BATTERY);
BIND_ENUM_CONSTANT(OS::POWERSTATE_CHARGING);
BIND_ENUM_CONSTANT(OS::POWERSTATE_CHARGED);
BIND_ENUM_CONSTANT(POWERSTATE_UNKNOWN);
BIND_ENUM_CONSTANT(POWERSTATE_ON_BATTERY);
BIND_ENUM_CONSTANT(POWERSTATE_NO_BATTERY);
BIND_ENUM_CONSTANT(POWERSTATE_CHARGING);
BIND_ENUM_CONSTANT(POWERSTATE_CHARGED);
}
_OS::_OS() {

11
core/bind/core_bind.h
View file

@ -97,6 +97,14 @@ protected:
static _OS *singleton;
public:
enum PowerState {
POWERSTATE_UNKNOWN, /**< cannot determine power status */
POWERSTATE_ON_BATTERY, /**< Not plugged in, running on the battery */
POWERSTATE_NO_BATTERY, /**< Plugged in, no battery available */
POWERSTATE_CHARGING, /**< Plugged in, charging battery */
POWERSTATE_CHARGED /**< Plugged in, battery charged */
};
enum Weekday {
DAY_SUNDAY,
DAY_MONDAY,
@ -303,7 +311,7 @@ public:
void set_use_vsync(bool p_enable);
bool is_vsync_enabled() const;
OS::PowerState get_power_state();
PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
@ -312,6 +320,7 @@ public:
_OS();
};
VARIANT_ENUM_CAST(_OS::PowerState);
VARIANT_ENUM_CAST(_OS::Weekday);
VARIANT_ENUM_CAST(_OS::Month);
VARIANT_ENUM_CAST(_OS::SystemDir);