浏览代码

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

Rémi Verschelde 3 年之前
父节点
当前提交
70e7540615
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      scene/gui/tree.cpp

+ 2 - 5
scene/gui/tree.cpp

@@ -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--) {
 				Ref<Texture> b = p_item->cells[i].buttons[j].texture;
 				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;
 
 				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
-					cache.button_pressed->draw(get_canvas_item(), Rect2(o, s));
+					// Being pressed.
+					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;