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

Merge pull request #60896 from timothyqiu/tree-button-icon-3.x

Browse source
This commit is contained in:
Rémi Verschelde 2022-05-09 13:40:01 +02:00 committed by GitHub
commit 70e7540615
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/gui/tree.cpp
View file

@ -1124,15 +1124,12 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
for (int j = p_item->cells[i].buttons.size() - 1; j >= 0; j--) { for (int j = p_item->cells[i].buttons.size() - 1; j >= 0; j--) {
Ref<Texture> b = p_item->cells[i].buttons[j].texture; Ref<Texture> b = p_item->cells[i].buttons[j].texture;
Size2 s = b->get_size() + cache.button_pressed->get_minimum_size(); Size2 s = b->get_size() + cache.button_pressed->get_minimum_size();
if (s.height < label_h) {
s.height = label_h;
}
Point2i o = Point2i(ofs + w - s.width, p_pos.y) - cache.offset + p_draw_ofs; Point2i o = Point2i(ofs + w - s.width, p_pos.y) - cache.offset + p_draw_ofs;
if (cache.click_type == Cache::CLICK_BUTTON && cache.click_item == p_item && cache.click_column == i && cache.click_index == j && !p_item->cells[i].buttons[j].disabled) { if (cache.click_type == Cache::CLICK_BUTTON && cache.click_item == p_item && cache.click_column == i && cache.click_index == j && !p_item->cells[i].buttons[j].disabled) {
//being pressed // Being pressed.
cache.button_pressed->draw(get_canvas_item(), Rect2(o, s)); cache.button_pressed->draw(get_canvas_item(), Rect2(o.x, o.y, s.width, MAX(s.height, label_h)));
} }
o.y += (label_h - s.height) / 2; o.y += (label_h - s.height) / 2;