summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/box_container.cpp2
-rw-r--r--scene/gui/control.cpp2
-rw-r--r--scene/gui/item_list.cpp4
-rw-r--r--scene/gui/label.cpp2
-rw-r--r--scene/gui/line_edit.cpp2
-rw-r--r--scene/gui/rich_text_label.cpp2
-rw-r--r--scene/gui/separator.h2
-rw-r--r--scene/gui/tab_container.cpp4
-rw-r--r--scene/gui/text_edit.cpp2
-rw-r--r--scene/gui/tree.cpp10
10 files changed, 16 insertions, 16 deletions
diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp
index 7ca44ac27b..9c5ddb3e7c 100644
--- a/scene/gui/box_container.cpp
+++ b/scene/gui/box_container.cpp
@@ -42,7 +42,7 @@ void BoxContainer::_resort() {
/** First pass, determine minimum size AND amount of stretchable elements */
- Size2i new_size=get_size();;
+ Size2i new_size=get_size();
int sep=get_constant("separation");//,vertical?"VBoxContainer":"HBoxContainer");
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 533d24f998..e012874f5b 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -1715,7 +1715,7 @@ Control *Control::find_next_valid_focus() const {
if (!next_child) {
- next_child=const_cast<Control*>(this);;
+ next_child=const_cast<Control*>(this);
while(next_child) {
if (next_child->data.SI || next_child->data.RI)
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index a3ed0a91cf..a42ef08bf3 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -300,7 +300,7 @@ void ItemList::move_item(int p_item,int p_to_pos) {
ERR_FAIL_INDEX(p_to_pos,items.size()+1);
Item it=items[p_item];
- items.remove(p_item);;
+ items.remove(p_item);
if (p_to_pos>p_item) {
p_to_pos--;
@@ -905,7 +905,7 @@ void ItemList::_notification(int p_what) {
Vector2 ofs;
int col=0;
int max_h=0;
- separators.clear();;
+ separators.clear();
for(int i=0;i<items.size();i++) {
if (current_columns>1 && items[i].rect_cache.size.width+ofs.x > fit_size) {
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
index cd500a62bc..d32b4c6de4 100644
--- a/scene/gui/label.cpp
+++ b/scene/gui/label.cpp
@@ -204,7 +204,7 @@ void Label::_notification(int p_what) {
} break;
case ALIGN_CENTER: {
- x_ofs=int(size.width-(taken+spaces*space_w))/2;;
+ x_ofs=int(size.width-(taken+spaces*space_w))/2;
} break;
case ALIGN_RIGHT: {
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 3a72e0e445..fe242ee708 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -1320,7 +1320,7 @@ void LineEdit::_bind_methods() {
ADD_PROPERTYNZ( PropertyInfo( Variant::STRING, "placeholder_text" ), _SCS("set_placeholder"),_SCS("get_placeholder") );
ADD_PROPERTYNZ( PropertyInfo( Variant::REAL, "placeholder_alpha",PROPERTY_HINT_RANGE,"0,1,0.001" ), _SCS("set_placeholder_alpha"),_SCS("get_placeholder_alpha") );
ADD_GROUP("Caret","caret_");
- ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret_blink"), _SCS("cursor_set_blink_enabled"), _SCS("cursor_get_blink_enabled"));;
+ ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret_blink"), _SCS("cursor_set_blink_enabled"), _SCS("cursor_get_blink_enabled"));
ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "caret_blink_speed",PROPERTY_HINT_RANGE,"0.1,10,0.1"), _SCS("cursor_set_blink_speed"),_SCS("cursor_get_blink_speed") );
}
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 434fb36e24..5fe5f47d1b 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -103,7 +103,7 @@ void RichTextLabel::_process_line(ItemFrame *p_frame,const Vector2& p_ofs,int &y
int line_ofs=0;
int margin=_find_margin(it,p_base_font);
- Align align=_find_align(it);;
+ Align align=_find_align(it);
int line=0;
int spaces=0;
diff --git a/scene/gui/separator.h b/scene/gui/separator.h
index 5fb17e1c2e..56d8a9724f 100644
--- a/scene/gui/separator.h
+++ b/scene/gui/separator.h
@@ -45,7 +45,7 @@ protected:
void _notification(int p_what);
public:
- virtual Size2 get_minimum_size() const;;
+ virtual Size2 get_minimum_size() const;
Separator();
~Separator();
diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index 52d26b29de..11802ab0fb 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -40,7 +40,7 @@ int TabContainer::_get_top_margin() const {
int h = MAX( tab_bg->get_minimum_size().height,tab_fg->get_minimum_size().height);
- int ch = font->get_height();;
+ int ch = font->get_height();
for(int i=0;i<get_child_count();i++) {
Control *c = get_child(i)->cast_to<Control>();
@@ -99,7 +99,7 @@ void TabContainer::_gui_input(const InputEvent& p_event) {
pp_pos.y+=menu->get_height();
popup->set_global_pos( pp_pos );
- popup->popup();;
+ popup->popup();
return;
}
pos.x-=tabs_ofs_cache;
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 8efff21fc9..d1a8c458ba 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -247,7 +247,7 @@ void TextEdit::Text::clear_caches() {
void TextEdit::Text::clear() {
- text.clear();;
+ text.clear();
insert(0,"");
}
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index 58c829690f..2cfebb7c1e 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -611,7 +611,7 @@ void TreeItem::clear_custom_color(int p_column) {
ERR_FAIL_INDEX( p_column, cells.size() );
cells[p_column].custom_color=false;
- cells[p_column].color=Color();;
+ cells[p_column].color=Color();
_changed_notify(p_column);
}
@@ -642,7 +642,7 @@ void TreeItem::clear_custom_bg_color(int p_column) {
ERR_FAIL_INDEX( p_column, cells.size() );
cells[p_column].custom_bg_color=false;
- cells[p_column].bg_color=Color();;
+ cells[p_column].bg_color=Color();
_changed_notify(p_column);
}
@@ -1258,7 +1258,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
icon_ofs+=item_rect.pos;
- draw_texture_rect(p_item->cells[i].icon,Rect2(icon_ofs,icon_size));;
+ draw_texture_rect(p_item->cells[i].icon,Rect2(icon_ofs,icon_size));
//p_item->cells[i].icon->draw(ci, icon_ofs);
} break;
@@ -2675,7 +2675,7 @@ void Tree::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) {
- update_cache();;
+ update_cache();
}
if (p_what==NOTIFICATION_DRAG_END) {
@@ -3330,7 +3330,7 @@ TreeItem* Tree::_find_item_at_pos(TreeItem*p_item, const Point2& p_pos,int& r_co
if (root!=p_item || ! hide_root) {
- h = compute_item_height(p_item)+cache.vseparation;;
+ h = compute_item_height(p_item)+cache.vseparation;
if (pos.y<h) {
if (drop_mode_flags==DROP_MODE_ON_ITEM) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 23:07:36 +0000