1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00

Bring that Whole New World to the Old Continent too

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

View File

@@ -27,79 +27,76 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "button.h"
#include "servers/visual_server.h"
#include "print_string.h"
#include "servers/visual_server.h"
#include "translation.h"
Size2 Button::get_minimum_size() const {
Size2 minsize=get_font("font")->get_string_size( text );
Size2 minsize = get_font("font")->get_string_size(text);
if (clip_text)
minsize.width=0;
minsize.width = 0;
Ref<Texture> _icon;
if (icon.is_null() && has_icon("icon"))
_icon=Control::get_icon("icon");
_icon = Control::get_icon("icon");
else
_icon=icon;
_icon = icon;
if (!_icon.is_null()) {
minsize.height=MAX( minsize.height, _icon->get_height() );
minsize.width+=_icon->get_width();
if (text!="")
minsize.width+=get_constant("hseparation");
minsize.height = MAX(minsize.height, _icon->get_height());
minsize.width += _icon->get_width();
if (text != "")
minsize.width += get_constant("hseparation");
}
return get_stylebox("normal" )->get_minimum_size() + minsize;
return get_stylebox("normal")->get_minimum_size() + minsize;
}
void Button::_notification(int p_what) {
if (p_what==NOTIFICATION_DRAW) {
if (p_what == NOTIFICATION_DRAW) {
RID ci = get_canvas_item();
Size2 size=get_size();
Size2 size = get_size();
Color color;
//print_line(get_text()+": "+itos(is_flat())+" hover "+itos(get_draw_mode()));
Ref<StyleBox> style = get_stylebox("normal");
switch( get_draw_mode() ) {
switch (get_draw_mode()) {
case DRAW_NORMAL: {
style = get_stylebox("normal");
if (!flat)
style->draw( ci, Rect2(Point2(0,0), size) );
color=get_color("font_color");
style->draw(ci, Rect2(Point2(0, 0), size));
color = get_color("font_color");
} break;
case DRAW_PRESSED: {
style = get_stylebox("pressed");
style->draw( ci, Rect2(Point2(0,0), size) );
style->draw(ci, Rect2(Point2(0, 0), size));
if (has_color("font_color_pressed"))
color=get_color("font_color_pressed");
color = get_color("font_color_pressed");
else
color=get_color("font_color");
color = get_color("font_color");
} break;
case DRAW_HOVER: {
style = get_stylebox("hover");
style->draw( ci, Rect2(Point2(0,0), size) );
color=get_color("font_color_hover");
style->draw(ci, Rect2(Point2(0, 0), size));
color = get_color("font_color_hover");
} break;
case DRAW_DISABLED: {
style = get_stylebox("disabled");
style->draw( ci, Rect2(Point2(0,0), size) );
color=get_color("font_color_disabled");
style->draw(ci, Rect2(Point2(0, 0), size));
color = get_color("font_color_disabled");
} break;
}
@@ -107,57 +104,53 @@ void Button::_notification(int p_what) {
if (has_focus()) {
Ref<StyleBox> style = get_stylebox("focus");
style->draw(ci,Rect2(Point2(),size));
style->draw(ci, Rect2(Point2(), size));
}
Ref<Font> font=get_font("font");
Ref<Font> font = get_font("font");
Ref<Texture> _icon;
if (icon.is_null() && has_icon("icon"))
_icon=Control::get_icon("icon");
_icon = Control::get_icon("icon");
else
_icon=icon;
_icon = icon;
Point2 icon_ofs = (!_icon.is_null())?Point2( _icon->get_width() + get_constant("hseparation"), 0):Point2();
int text_clip=size.width - style->get_minimum_size().width - icon_ofs.width;
Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - font->get_string_size( text ) )/2.0;
Point2 icon_ofs = (!_icon.is_null()) ? Point2(_icon->get_width() + get_constant("hseparation"), 0) : Point2();
int text_clip = size.width - style->get_minimum_size().width - icon_ofs.width;
Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - font->get_string_size(text)) / 2.0;
switch(align) {
switch (align) {
case ALIGN_LEFT: {
text_ofs.x = style->get_margin(MARGIN_LEFT) + icon_ofs.x;
text_ofs.y+=style->get_offset().y;
text_ofs.y += style->get_offset().y;
} break;
case ALIGN_CENTER: {
if (text_ofs.x<0)
text_ofs.x=0;
text_ofs+=icon_ofs;
text_ofs+=style->get_offset();
if (text_ofs.x < 0)
text_ofs.x = 0;
text_ofs += icon_ofs;
text_ofs += style->get_offset();
} break;
case ALIGN_RIGHT: {
text_ofs.x=size.x - style->get_margin(MARGIN_RIGHT) - font->get_string_size( text ).x;
text_ofs.y+=style->get_offset().y;
text_ofs.x = size.x - style->get_margin(MARGIN_RIGHT) - font->get_string_size(text).x;
text_ofs.y += style->get_offset().y;
} break;
}
text_ofs.y+=font->get_ascent();
font->draw( ci, text_ofs.floor(), text, color,clip_text?text_clip:-1);
text_ofs.y += font->get_ascent();
font->draw(ci, text_ofs.floor(), text, color, clip_text ? text_clip : -1);
if (!_icon.is_null()) {
int valign = size.height-style->get_minimum_size().y;
int valign = size.height - style->get_minimum_size().y;
_icon->draw(ci,style->get_offset()+Point2(0, Math::floor( (valign-_icon->get_height())/2.0 ) ),is_disabled()?Color(1,1,1,0.4):Color(1,1,1) );
_icon->draw(ci, style->get_offset() + Point2(0, Math::floor((valign - _icon->get_height()) / 2.0)), is_disabled() ? Color(1, 1, 1, 0.4) : Color(1, 1, 1));
}
}
}
void Button::set_text(const String& p_text) {
void Button::set_text(const String &p_text) {
if (text==p_text)
if (text == p_text)
return;
text=XL_MESSAGE(p_text);
text = XL_MESSAGE(p_text);
update();
_change_notify("text");
minimum_size_changed();
@@ -167,12 +160,11 @@ String Button::get_text() const {
return text;
}
void Button::set_icon(const Ref<Texture> &p_icon) {
void Button::set_icon(const Ref<Texture>& p_icon) {
if (icon==p_icon)
if (icon == p_icon)
return;
icon=p_icon;
icon = p_icon;
update();
_change_notify("icon");
minimum_size_changed();
@@ -185,7 +177,7 @@ Ref<Texture> Button::get_icon() const {
void Button::set_flat(bool p_flat) {
flat=p_flat;
flat = p_flat;
update();
_change_notify("flat");
}
@@ -197,7 +189,7 @@ bool Button::is_flat() const {
void Button::set_clip_text(bool p_clip_text) {
clip_text=p_clip_text;
clip_text = p_clip_text;
update();
minimum_size_changed();
}
@@ -209,7 +201,7 @@ bool Button::get_clip_text() const {
void Button::set_text_align(TextAlign p_align) {
align=p_align;
align = p_align;
update();
}
@@ -220,41 +212,36 @@ Button::TextAlign Button::get_text_align() const {
void Button::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_text","text"),&Button::set_text);
ObjectTypeDB::bind_method(_MD("get_text"),&Button::get_text);
ObjectTypeDB::bind_method(_MD("set_button_icon","texture:Texture"),&Button::set_icon);
ObjectTypeDB::bind_method(_MD("get_button_icon:Texture"),&Button::get_icon);
ObjectTypeDB::bind_method(_MD("set_flat","enabled"),&Button::set_flat);
ObjectTypeDB::bind_method(_MD("set_clip_text","enabled"),&Button::set_clip_text);
ObjectTypeDB::bind_method(_MD("get_clip_text"),&Button::get_clip_text);
ObjectTypeDB::bind_method(_MD("set_text_align","align"),&Button::set_text_align);
ObjectTypeDB::bind_method(_MD("get_text_align"),&Button::get_text_align);
ObjectTypeDB::bind_method(_MD("is_flat"),&Button::is_flat);
ObjectTypeDB::bind_method(_MD("set_text", "text"), &Button::set_text);
ObjectTypeDB::bind_method(_MD("get_text"), &Button::get_text);
ObjectTypeDB::bind_method(_MD("set_button_icon", "texture:Texture"), &Button::set_icon);
ObjectTypeDB::bind_method(_MD("get_button_icon:Texture"), &Button::get_icon);
ObjectTypeDB::bind_method(_MD("set_flat", "enabled"), &Button::set_flat);
ObjectTypeDB::bind_method(_MD("set_clip_text", "enabled"), &Button::set_clip_text);
ObjectTypeDB::bind_method(_MD("get_clip_text"), &Button::get_clip_text);
ObjectTypeDB::bind_method(_MD("set_text_align", "align"), &Button::set_text_align);
ObjectTypeDB::bind_method(_MD("get_text_align"), &Button::get_text_align);
ObjectTypeDB::bind_method(_MD("is_flat"), &Button::is_flat);
BIND_CONSTANT( ALIGN_LEFT );
BIND_CONSTANT( ALIGN_CENTER );
BIND_CONSTANT( ALIGN_RIGHT );
ADD_PROPERTYNZ( PropertyInfo( Variant::STRING, "text", PROPERTY_HINT_NONE,"",PROPERTY_USAGE_DEFAULT_INTL ), _SCS("set_text"),_SCS("get_text") );
ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture" ), _SCS("set_button_icon"),_SCS("get_button_icon") );
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "flat" ), _SCS("set_flat"),_SCS("is_flat") );
ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "clip_text" ), _SCS("set_clip_text"),_SCS("get_clip_text") );
ADD_PROPERTYNO( PropertyInfo( Variant::INT, "align",PROPERTY_HINT_ENUM,"Left,Center,Right" ), _SCS("set_text_align"),_SCS("get_text_align") );
BIND_CONSTANT(ALIGN_LEFT);
BIND_CONSTANT(ALIGN_CENTER);
BIND_CONSTANT(ALIGN_RIGHT);
ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT_INTL), _SCS("set_text"), _SCS("get_text"));
ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), _SCS("set_button_icon"), _SCS("get_button_icon"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flat"), _SCS("set_flat"), _SCS("is_flat"));
ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "clip_text"), _SCS("set_clip_text"), _SCS("get_clip_text"));
ADD_PROPERTYNO(PropertyInfo(Variant::INT, "align", PROPERTY_HINT_ENUM, "Left,Center,Right"), _SCS("set_text_align"), _SCS("get_text_align"));
}
Button::Button(const String &p_text) {
flat=false;
clip_text=false;
flat = false;
clip_text = false;
set_stop_mouse(true);
set_text(p_text);
align=ALIGN_CENTER;
align = ALIGN_CENTER;
}
Button::~Button()
{
Button::~Button() {
}