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

Merge pull request #37682 from theludovyc/master 

Erase if ( i < offset ) { continue;} at start in for loops
This commit is contained in:
Rémi Verschelde 2020-04-08 11:36:44 +02:00 committed by GitHub
parent d89dc5794a 7e2de76236
commit b80631a394
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scene/gui/tabs.cpp
View File

@ -184,10 +184,7 @@ void Tabs::_gui_input(const Ref<InputEvent> &p_event) {
} }
int found = -1; int found = -1;
for (int i = 0; i < tabs.size(); i++) { for (int i = offset; i < tabs.size(); i++) {
if (i < offset)
continue;
if (tabs[i].rb_rect.has_point(pos)) { if (tabs[i].rb_rect.has_point(pos)) {
rb_pressing = true; rb_pressing = true;
@ -276,10 +273,7 @@ void Tabs::_notification(int p_what) {
missing_right = false; missing_right = false;
for (int i = 0; i < tabs.size(); i++) { for (int i = offset; i < tabs.size(); i++) {
if (i < offset)
continue;
tabs.write[i].ofs_cache = w; tabs.write[i].ofs_cache = w;
@ -499,10 +493,7 @@ void Tabs::_update_hover() {
// test hovering to display right or close button // test hovering to display right or close button
int hover_now = -1; int hover_now = -1;
int hover_buttons = -1; int hover_buttons = -1;
for (int i = 0; i < tabs.size(); i++) { for (int i = offset; i < tabs.size(); i++) {
if (i < offset)
continue;
Rect2 rect = get_tab_rect(i); Rect2 rect = get_tab_rect(i);
if (rect.has_point(pos)) { if (rect.has_point(pos)) {
@ -559,9 +550,8 @@ void Tabs::_update_cache() {
if (count_resize > 0) { if (count_resize > 0) {
m_width = MAX((limit - size_fixed) / count_resize, min_width); m_width = MAX((limit - size_fixed) / count_resize, min_width);
} }
for (int i = 0; i < tabs.size(); i++) { for (int i = offset; i < tabs.size(); i++) {
if (i < offset)
continue;
Ref<StyleBox> sb; Ref<StyleBox> sb;
if (tabs[i].disabled) { if (tabs[i].disabled) {
sb = tab_disabled; sb = tab_disabled;
@ -753,10 +743,7 @@ void Tabs::drop_data(const Point2 &p_point, const Variant &p_data) {
int Tabs::get_tab_idx_at_point(const Point2 &p_point) const { int Tabs::get_tab_idx_at_point(const Point2 &p_point) const {
int hover_now = -1; int hover_now = -1;
for (int i = 0; i < tabs.size(); i++) { for (int i = offset; i < tabs.size(); i++) {
if (i < offset)
continue;
Rect2 rect = get_tab_rect(i); Rect2 rect = get_tab_rect(i);
if (rect.has_point(p_point)) { if (rect.has_point(p_point)) {
@ -850,10 +837,7 @@ void Tabs::_ensure_no_over_offset() {
while (offset > 0) { while (offset > 0) {
int total_w = 0; int total_w = 0;
for (int i = 0; i < tabs.size(); i++) { for (int i = offset - 1; i < tabs.size(); i++) {
if (i < offset - 1)
continue;
total_w += tabs[i].size_cache; total_w += tabs[i].size_cache;
} }