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

46
scene/gui/button_array.h
View File

@@ -34,6 +34,7 @@
class ButtonArray : public Control {
OBJ_TYPE(ButtonArray, Control);
public:
enum Align {
ALIGN_BEGIN,
@@ -42,8 +43,8 @@ public:
ALIGN_FILL,
ALIGN_EXPAND_FILL
};
private:
private:
Orientation orientation;
Align align;
@@ -64,19 +65,17 @@ private:
double min_button_size;
Vector<Button> buttons;
protected:
bool _set(const StringName& p_name, const Variant& p_value);
bool _get(const StringName& p_name,Variant &r_ret) const;
void _get_property_list( List<PropertyInfo> *p_list) const;
protected:
bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const;
void _get_property_list(List<PropertyInfo> *p_list) const;
void _notification(int p_what);
static void _bind_methods();
public:
void _input_event(const InputEvent& p_event);
void _input_event(const InputEvent &p_event);
void set_align(Align p_align);
Align get_align() const;
@@ -84,13 +83,12 @@ public:
void set_flat(bool p_flat);
bool is_flat() const;
void add_button(const String& p_button,const String& p_tooltip="");
void add_icon_button(const Ref<Texture>& p_icon,const String& p_button="",const String& p_tooltip="");
void set_button_text(int p_button, const String& p_text);
void set_button_tooltip(int p_button, const String& p_text);
void set_button_icon(int p_button, const Ref<Texture>& p_icon);
void add_button(const String &p_button, const String &p_tooltip = "");
void add_icon_button(const Ref<Texture> &p_icon, const String &p_button = "", const String &p_tooltip = "");
void set_button_text(int p_button, const String &p_text);
void set_button_tooltip(int p_button, const String &p_text);
void set_button_icon(int p_button, const Ref<Texture> &p_icon);
String get_button_text(int p_button) const;
String get_button_tooltip(int p_button) const;
@@ -108,25 +106,25 @@ public:
virtual Size2 get_minimum_size() const;
virtual void get_translatable_strings(List<String> *p_strings) const;
virtual String get_tooltip(const Point2& p_pos) const;
virtual String get_tooltip(const Point2 &p_pos) const;
ButtonArray(Orientation p_orientation=HORIZONTAL);
ButtonArray(Orientation p_orientation = HORIZONTAL);
};
class HButtonArray : public ButtonArray {
OBJ_TYPE(HButtonArray,ButtonArray);
public:
OBJ_TYPE(HButtonArray, ButtonArray);
HButtonArray() : ButtonArray(HORIZONTAL) {};
public:
HButtonArray()
: ButtonArray(HORIZONTAL){};
};
class VButtonArray : public ButtonArray {
OBJ_TYPE(VButtonArray,ButtonArray);
public:
OBJ_TYPE(VButtonArray, ButtonArray);
VButtonArray() : ButtonArray(VERTICAL) {};
public:
VButtonArray()
: ButtonArray(VERTICAL){};
};
#endif // BUTTON_ARRAY_H