asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #81155 from garychia/separator_priority

Browse source 
ItemList: Draw separators before selected style boxes
This commit is contained in:
Rémi Verschelde 2023-08-30 12:16:29 +02:00
commit bc88dca176
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
scene/gui/item_list.cpp
View file

@ -1092,6 +1092,32 @@ void ItemList::_notification(int p_what) {
// Define a visible frame to check against and optimize drawing.
const Rect2 clip(-base_ofs, size);
// Do a binary search to find the first separator that is below clip_position.y.
int first_visible_separator = 0;
{
int lo = 0;
int hi = separators.size();
while (lo < hi) {
const int mid = (lo + hi) / 2;
if (separators[mid] < clip.position.y) {
lo = mid + 1;
} else {
hi = mid;
}
}
first_visible_separator = lo;
}
// Draw visible separators.
for (int i = first_visible_separator; i < separators.size(); i++) {
if (separators[i] > clip.position.y + clip.size.y) {
break; // done
}
const int y = base_ofs.y + separators[i];
draw_line(Vector2(theme_cache.panel_style->get_margin(SIDE_LEFT), y), Vector2(width, y), theme_cache.guide_color);
}
// Do a binary search to find the first item whose rect reaches below clip.position.y.
int first_item_visible;
{
@ -1310,32 +1336,6 @@ void ItemList::_notification(int p_what) {
draw_style_box(cursor, r);
}
}
// Do a binary search to find the first separator that is below clip_position.y.
int first_visible_separator = 0;
{
int lo = 0;
int hi = separators.size();
while (lo < hi) {
const int mid = (lo + hi) / 2;
if (separators[mid] < clip.position.y) {
lo = mid + 1;
} else {
hi = mid;
}
}
first_visible_separator = lo;
}
// Draw visible separators.
for (int i = first_visible_separator; i < separators.size(); i++) {
if (separators[i] > clip.position.y + clip.size.y) {
break; // done
}
const int y = base_ofs.y + separators[i];
draw_line(Vector2(theme_cache.panel_style->get_margin(SIDE_LEFT), y), Vector2(width, y), theme_cache.guide_color);
}
} break;
}
}