godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flat button support in ButtonArray. Fixes #7153

Browse Source 
(cherry picked from commit 4b7443aeea)
This commit is contained in:
Zher Huei Lee 2016-11-19 21:48:39 +08:00 committed by Rémi Verschelde
parent b56c00cc56
commit fe81402257
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scene/gui/button_array.cpp
View File

@ -267,9 +267,9 @@ void ButtonArray::_notification(int p_what) {
} else { } else {
if (hover==i) if (hover==i)
draw_style_box(style_hover,r); draw_style_box(style_hover,r);
else else if (!flat)
draw_style_box(style_normal,r); draw_style_box(style_normal,r);
sbsize=style_selected->get_minimum_size(); sbsize=style_normal->get_minimum_size();
sbofs=style_normal->get_offset(); sbofs=style_normal->get_offset();
f=font_normal; f=font_normal;
c=color_normal; c=color_normal;
@ -388,6 +388,17 @@ ButtonArray::Align ButtonArray::get_align() const {
return align; return align;
} }
void ButtonArray::set_flat(bool p_flat) {
flat=p_flat;
update();
}
bool ButtonArray::is_flat() const {
return flat;
}
void ButtonArray::add_button(const String& p_text,const String& p_tooltip) { void ButtonArray::add_button(const String& p_text,const String& p_tooltip) {
@ -525,6 +536,8 @@ void ButtonArray::_bind_methods() {
ObjectTypeDB::bind_method(_MD("get_button_tooltip","button_idx"),&ButtonArray::get_button_tooltip); ObjectTypeDB::bind_method(_MD("get_button_tooltip","button_idx"),&ButtonArray::get_button_tooltip);
ObjectTypeDB::bind_method(_MD("get_button_icon:Texture","button_idx"),&ButtonArray::get_button_icon); ObjectTypeDB::bind_method(_MD("get_button_icon:Texture","button_idx"),&ButtonArray::get_button_icon);
ObjectTypeDB::bind_method(_MD("get_button_count"),&ButtonArray::get_button_count); ObjectTypeDB::bind_method(_MD("get_button_count"),&ButtonArray::get_button_count);
ObjectTypeDB::bind_method(_MD("set_flat","enabled"),&ButtonArray::set_flat);
ObjectTypeDB::bind_method(_MD("is_flat"),&ButtonArray::is_flat);
ObjectTypeDB::bind_method(_MD("get_selected"),&ButtonArray::get_selected); ObjectTypeDB::bind_method(_MD("get_selected"),&ButtonArray::get_selected);
ObjectTypeDB::bind_method(_MD("get_hovered"),&ButtonArray::get_hovered); ObjectTypeDB::bind_method(_MD("get_hovered"),&ButtonArray::get_hovered);
ObjectTypeDB::bind_method(_MD("set_selected","button_idx"),&ButtonArray::set_selected); ObjectTypeDB::bind_method(_MD("set_selected","button_idx"),&ButtonArray::set_selected);
@ -539,6 +552,8 @@ void ButtonArray::_bind_methods() {
BIND_CONSTANT( ALIGN_FILL ); BIND_CONSTANT( ALIGN_FILL );
BIND_CONSTANT( ALIGN_EXPAND_FILL ); BIND_CONSTANT( ALIGN_EXPAND_FILL );
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "flat" ), _SCS("set_flat"),_SCS("is_flat") );
ADD_SIGNAL( MethodInfo("button_selected",PropertyInfo(Variant::INT,"button_idx"))); ADD_SIGNAL( MethodInfo("button_selected",PropertyInfo(Variant::INT,"button_idx")));
} }
@ -549,5 +564,6 @@ ButtonArray::ButtonArray(Orientation p_orientation) {
selected=-1; selected=-1;
set_focus_mode(FOCUS_ALL); set_focus_mode(FOCUS_ALL);
hover=-1; hover=-1;
flat=false;
min_button_size = -1; min_button_size = -1;
} }

4
scene/gui/button_array.h
View File

@ -59,6 +59,7 @@ private:
int selected; int selected;
int hover; int hover;
bool flat;
double min_button_size; double min_button_size;
Vector<Button> buttons; Vector<Button> buttons;
@ -79,6 +80,9 @@ public:
void set_align(Align p_align); void set_align(Align p_align);
Align get_align() const; Align get_align() const;
void set_flat(bool p_flat);
bool is_flat() const;
void add_button(const String& p_button,const String& p_tooltip=""); 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 add_icon_button(const Ref<Texture>& p_icon,const String& p_button="",const String& p_tooltip="");