godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
scene/gui/input_action.cpp
View File

@@ -1,42 +1,41 @@
#include "input_action.h"
#include "os/keyboard.h"
void ShortCut::set_shortcut(const InputEvent& p_shortcut){
void ShortCut::set_shortcut(const InputEvent &p_shortcut) {
shortcut=p_shortcut;
shortcut = p_shortcut;
emit_changed();
}
InputEvent ShortCut::get_shortcut() const{
InputEvent ShortCut::get_shortcut() const {
return shortcut;
}
bool ShortCut::is_shortcut(const InputEvent& p_event) const {
bool ShortCut::is_shortcut(const InputEvent &p_event) const {
bool same=false;
bool same = false;
switch(p_event.type) {
switch (p_event.type) {
case InputEvent::KEY: {
same=(shortcut.key.scancode==p_event.key.scancode && shortcut.key.mod == p_event.key.mod);
same = (shortcut.key.scancode == p_event.key.scancode && shortcut.key.mod == p_event.key.mod);
} break;
case InputEvent::JOYSTICK_BUTTON: {
same=(shortcut.joy_button.button_index==p_event.joy_button.button_index);
same = (shortcut.joy_button.button_index == p_event.joy_button.button_index);
} break;
case InputEvent::MOUSE_BUTTON: {
same=(shortcut.mouse_button.button_index==p_event.mouse_button.button_index);
same = (shortcut.mouse_button.button_index == p_event.mouse_button.button_index);
} break;
case InputEvent::JOYSTICK_MOTION: {
same=(shortcut.joy_motion.axis==p_event.joy_motion.axis && (shortcut.joy_motion.axis_value < 0) == (p_event.joy_motion.axis_value < 0));
same = (shortcut.joy_motion.axis == p_event.joy_motion.axis && (shortcut.joy_motion.axis_value < 0) == (p_event.joy_motion.axis_value < 0));
} break;
default: {};
@@ -47,7 +46,7 @@ bool ShortCut::is_shortcut(const InputEvent& p_event) const {
String ShortCut::get_as_text() const {
switch(shortcut.type) {
switch (shortcut.type) {
case InputEvent::NONE: {
@@ -57,35 +56,35 @@ String ShortCut::get_as_text() const {
String str;
if (shortcut.key.mod.shift)
str+=RTR("Shift+");
str += RTR("Shift+");
if (shortcut.key.mod.alt)
str+=RTR("Alt+");
str += RTR("Alt+");
if (shortcut.key.mod.control)
str+=RTR("Ctrl+");
str += RTR("Ctrl+");
if (shortcut.key.mod.meta)
str+=RTR("Meta+");
str += RTR("Meta+");
str+=keycode_get_string(shortcut.key.scancode).capitalize();
str += keycode_get_string(shortcut.key.scancode).capitalize();
return str;
} break;
case InputEvent::JOYSTICK_BUTTON: {
String str = RTR("Device")+" "+itos(shortcut.device)+", "+RTR("Button")+" "+itos(shortcut.joy_button.button_index);
str+=".";
String str = RTR("Device") + " " + itos(shortcut.device) + ", " + RTR("Button") + " " + itos(shortcut.joy_button.button_index);
str += ".";
return str;
} break;
case InputEvent::MOUSE_BUTTON: {
String str = RTR("Device")+" "+itos(shortcut.device)+", ";
String str = RTR("Device") + " " + itos(shortcut.device) + ", ";
switch (shortcut.mouse_button.button_index) {
case BUTTON_LEFT: str+=RTR("Left Button."); break;
case BUTTON_RIGHT: str+=RTR("Right Button."); break;
case BUTTON_MIDDLE: str+=RTR("Middle Button."); break;
case BUTTON_WHEEL_UP: str+=RTR("Wheel Up."); break;
case BUTTON_WHEEL_DOWN: str+=RTR("Wheel Down."); break;
default: str+=RTR("Button")+" "+itos(shortcut.mouse_button.button_index)+".";
case BUTTON_LEFT: str += RTR("Left Button."); break;
case BUTTON_RIGHT: str += RTR("Right Button."); break;
case BUTTON_MIDDLE: str += RTR("Middle Button."); break;
case BUTTON_WHEEL_UP: str += RTR("Wheel Up."); break;
case BUTTON_WHEEL_DOWN: str += RTR("Wheel Down."); break;
default: str += RTR("Button") + " " + itos(shortcut.mouse_button.button_index) + ".";
}
return str;
@@ -93,7 +92,7 @@ String ShortCut::get_as_text() const {
case InputEvent::JOYSTICK_MOTION: {
int ax = shortcut.joy_motion.axis;
String str = RTR("Device")+" "+itos(shortcut.device)+", "+RTR("Axis")+" "+itos(ax)+".";
String str = RTR("Device") + " " + itos(shortcut.device) + ", " + RTR("Axis") + " " + itos(ax) + ".";
return str;
} break;
@@ -104,22 +103,21 @@ String ShortCut::get_as_text() const {
bool ShortCut::is_valid() const {
return shortcut.type!=InputEvent::NONE;
return shortcut.type != InputEvent::NONE;
}
void ShortCut::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_shortcut","event"),&ShortCut::set_shortcut);
ObjectTypeDB::bind_method(_MD("get_shortcut"),&ShortCut::get_shortcut);
ObjectTypeDB::bind_method(_MD("set_shortcut", "event"), &ShortCut::set_shortcut);
ObjectTypeDB::bind_method(_MD("get_shortcut"), &ShortCut::get_shortcut);
ObjectTypeDB::bind_method(_MD("is_valid"),&ShortCut::is_valid);
ObjectTypeDB::bind_method(_MD("is_valid"), &ShortCut::is_valid);
ObjectTypeDB::bind_method(_MD("is_shortcut","event"),&ShortCut::is_shortcut);
ObjectTypeDB::bind_method(_MD("get_as_text"),&ShortCut::get_as_text);
ObjectTypeDB::bind_method(_MD("is_shortcut", "event"), &ShortCut::is_shortcut);
ObjectTypeDB::bind_method(_MD("get_as_text"), &ShortCut::get_as_text);
ADD_PROPERTY(PropertyInfo(Variant::INPUT_EVENT,"shortcut"),_SCS("set_shortcut"),_SCS("get_shortcut"));
ADD_PROPERTY(PropertyInfo(Variant::INPUT_EVENT, "shortcut"), _SCS("set_shortcut"), _SCS("get_shortcut"));
}
ShortCut::ShortCut(){
ShortCut::ShortCut() {
}