diff options
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/box_container.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/control.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/dialogs.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/scroll_bar.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/tree.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp index 7c1487c42f..1096c43c10 100644 --- a/scene/gui/box_container.cpp +++ b/scene/gui/box_container.cpp @@ -98,7 +98,7 @@ void BoxContainer::_resort() { elements exist */ bool has_stretched = false; - while (stretch_ratio_total > 0) { // first of all, dont even be here if no stretchable objects exist + while (stretch_ratio_total > 0) { // first of all, don't even be here if no stretchable objects exist has_stretched = true; bool refit_successful = true; //assume refit-test will go well diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index a8e364a4cd..d2f3eea721 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -485,7 +485,7 @@ void Control::_notification(int p_notification) { } break; case NOTIFICATION_MOVED_IN_PARENT: { // some parents need to know the order of the childrens to draw (like TabContainer) - // update if necesary + // update if necessary if (data.parent) data.parent->update(); update(); diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index a58e62f061..35d54d9843 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -42,7 +42,7 @@ void WindowDialog::_post_popup() { void WindowDialog::_fix_size() { - // Perhaps this should be called when the viewport resizes aswell or windows go out of bounds... + // Perhaps this should be called when the viewport resizes as well or windows go out of bounds... // Ensure the whole window is visible. Point2i pos = get_global_pos(); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 322d9dee20..eaa2a66a56 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -125,7 +125,7 @@ void RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int if (cfont.is_null()) cfont = p_base_font; - //line height should be the font height for the first time, this ensures that an empty line will never have zero height and succesive newlines are displayed + //line height should be the font height for the first time, this ensures that an empty line will never have zero height and successive newlines are displayed int line_height = cfont->get_height(); Variant meta; diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 37f7b46e22..b27104f788 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -705,7 +705,7 @@ void ScrollBar::mouse_motion(const Point2& p_pos, const Point2& p_rel, int b.but if (value_ofs>(get_max()-get_page())) value_ofs=get_max()-get_page(); if (get_val()==value_ofs) - return; //dont bother if the value is the same + return; //don't bother if the value is the same set_val( value_ofs ); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index d63ef41239..9a999c9323 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -2912,7 +2912,7 @@ int Tree::get_column_width(int p_column) const { if (expand_area < expanding_total) return columns[p_column].min_width; - ERR_FAIL_COND_V(expanding_columns == 0, -1); // shouldnt happen + ERR_FAIL_COND_V(expanding_columns == 0, -1); // shouldn't happen return expand_area * columns[p_column].min_width / expanding_total; } |