Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Style: apply clang-format (5.0.0) to current source

Browse source
This commit is contained in:
Rémi Verschelde 2017-12-11 15:31:49 +01:00
parent 7e2d6b4450
commit 6a4e7198c5
147 changed files with 465 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scene/gui/box_container.h
View file

@ -70,8 +70,8 @@ class HBoxContainer : public BoxContainer {
OBJ_TYPE(HBoxContainer, BoxContainer);
public:
HBoxContainer()
: BoxContainer(false) {}
HBoxContainer() :
BoxContainer(false) {}
};
class MarginContainer;
@ -82,8 +82,8 @@ class VBoxContainer : public BoxContainer {
public:
MarginContainer *add_margin_child(const String &p_label, Control *p_control, bool p_expand = false);
VBoxContainer()
: BoxContainer(true) {}
VBoxContainer() :
BoxContainer(true) {}
};
VARIANT_ENUM_CAST(BoxContainer::AlignMode);

8
scene/gui/button_array.h
View file

@ -116,16 +116,16 @@ class HButtonArray : public ButtonArray {
OBJ_TYPE(HButtonArray, ButtonArray);
public:
HButtonArray()
: ButtonArray(HORIZONTAL){};
HButtonArray() :
ButtonArray(HORIZONTAL){};
};
class VButtonArray : public ButtonArray {
OBJ_TYPE(VButtonArray, ButtonArray);
public:
VButtonArray()
: ButtonArray(VERTICAL){};
VButtonArray() :
ButtonArray(VERTICAL){};
};
#endif // BUTTON_ARRAY_H

4
scene/gui/button_group.cpp
View file

@ -156,6 +156,6 @@ void ButtonGroup::_bind_methods() {
ADD_SIGNAL(MethodInfo("button_selected", PropertyInfo(Variant::OBJECT, "button", PROPERTY_HINT_RESOURCE_TYPE, "BaseButton")));
}
ButtonGroup::ButtonGroup()
: BoxContainer(true) {
ButtonGroup::ButtonGroup() :
BoxContainer(true) {
}

4
scene/gui/check_box.cpp
View file

@ -63,8 +63,8 @@ bool CheckBox::is_radio() {
return (parent != 0);
}
CheckBox::CheckBox(const String &p_text)
: Button(p_text) {
CheckBox::CheckBox(const String &p_text) :
Button(p_text) {
set_toggle_mode(true);
set_text_align(ALIGN_LEFT);
}

4
scene/gui/color_picker.cpp
View file

@ -435,8 +435,8 @@ void ColorPicker::_bind_methods() {
ADD_SIGNAL(MethodInfo("color_changed", PropertyInfo(Variant::COLOR, "color")));
}
ColorPicker::ColorPicker()
: BoxContainer(true) {
ColorPicker::ColorPicker() :
BoxContainer(true) {
updating = true;
edit_alpha = true;

1
scene/gui/file_dialog.h
View file

@ -33,7 +33,6 @@
#include "box_container.h"
#include "os/dir_access.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/option_button.h"
#include "scene/gui/tool_button.h"

6
scene/gui/line_edit.cpp
View file

@ -655,8 +655,7 @@ void LineEdit::_notification(int p_what) {
font->draw_char(ci, Point2(x_ofs, y_ofs + font_ascent), cchar, next, selected ? font_color_selected : font_color);
if (char_ofs == cursor_pos && draw_caret) {
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(
Point2(x_ofs, y_ofs), Size2(1, caret_height)),
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(Point2(x_ofs, y_ofs), Size2(1, caret_height)),
cursor_color);
}
@ -665,8 +664,7 @@ void LineEdit::_notification(int p_what) {
}
if (char_ofs == cursor_pos && draw_caret) { //may be at the end
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(
Point2(x_ofs, y_ofs), Size2(1, caret_height)),
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(Point2(x_ofs, y_ofs), Size2(1, caret_height)),
cursor_color);
}
} break;

8
scene/gui/scroll_bar.h
View file

@ -110,8 +110,8 @@ class HScrollBar : public ScrollBar {
OBJ_TYPE(HScrollBar, ScrollBar);
public:
HScrollBar()
: ScrollBar(HORIZONTAL) { set_v_size_flags(0); }
HScrollBar() :
ScrollBar(HORIZONTAL) { set_v_size_flags(0); }
};
class VScrollBar : public ScrollBar {
@ -119,8 +119,8 @@ class VScrollBar : public ScrollBar {
OBJ_TYPE(VScrollBar, ScrollBar);
public:
VScrollBar()
: ScrollBar(VERTICAL) { set_h_size_flags(0); }
VScrollBar() :
ScrollBar(VERTICAL) { set_h_size_flags(0); }
};
#endif

8
scene/gui/slider.h
View file

@ -73,8 +73,8 @@ class HSlider : public Slider {
OBJ_TYPE(HSlider, Slider);
public:
HSlider()
: Slider(HORIZONTAL) { set_v_size_flags(0); }
HSlider() :
Slider(HORIZONTAL) { set_v_size_flags(0); }
};
class VSlider : public Slider {
@ -82,8 +82,8 @@ class VSlider : public Slider {
OBJ_TYPE(VSlider, Slider);
public:
VSlider()
: Slider(VERTICAL) { set_h_size_flags(0); }
VSlider() :
Slider(VERTICAL) { set_h_size_flags(0); }
};
#endif // SLIDER_H

8
scene/gui/split_container.h
View file

@ -87,8 +87,8 @@ class HSplitContainer : public SplitContainer {
OBJ_TYPE(HSplitContainer, SplitContainer);
public:
HSplitContainer()
: SplitContainer(false) { set_default_cursor_shape(CURSOR_HSPLIT); }
HSplitContainer() :
SplitContainer(false) { set_default_cursor_shape(CURSOR_HSPLIT); }
};
class VSplitContainer : public SplitContainer {
@ -96,8 +96,8 @@ class VSplitContainer : public SplitContainer {
OBJ_TYPE(VSplitContainer, SplitContainer);
public:
VSplitContainer()
: SplitContainer(true) { set_default_cursor_shape(CURSOR_VSPLIT); }
VSplitContainer() :
SplitContainer(true) { set_default_cursor_shape(CURSOR_VSPLIT); }
};
#endif // SPLIT_CONTAINER_H