Center when scrolling to tree item.

This commit is contained in:
Stijn Hinlopen 2020-07-05 20:06:51 +02:00
parent df1724470d
commit 31824420e4
5 changed files with 24 additions and 15 deletions

View File

@ -240,6 +240,7 @@
<method name="scroll_to_item">
<return type="void" />
<argument index="0" name="item" type="TreeItem" />
<argument index="1" name="center_on_item" type="bool" default="false" />
<description>
Causes the [Tree] to jump to the specified [TreeItem].
</description>

View File

@ -446,14 +446,14 @@ void CreateDialog::_notification(int p_what) {
}
}
void CreateDialog::select_type(const String &p_type) {
void CreateDialog::select_type(const String &p_type, bool p_center_on_item) {
if (!search_options_types.has(p_type)) {
return;
}
TreeItem *to_select = search_options_types[p_type];
to_select->select(0);
search_options->scroll_to_item(to_select);
search_options->scroll_to_item(to_select, p_center_on_item);
if (EditorHelp::get_doc_data()->class_list.has(p_type) && !DTR(EditorHelp::get_doc_data()->class_list[p_type].brief_description).is_empty()) {
// Display both class name and description, since the help bit may be displayed
@ -520,7 +520,7 @@ Variant CreateDialog::instance_selected() {
void CreateDialog::_item_selected() {
String name = get_selected_type();
select_type(name);
select_type(name, false);
}
void CreateDialog::_hide_requested() {

View File

@ -79,7 +79,7 @@ class CreateDialog : public ConfirmationDialog {
void _sbox_input(const Ref<InputEvent> &p_ie);
void _text_changed(const String &p_newtext);
void select_type(const String &p_type);
void select_type(const String &p_type, bool p_center_on_item = true);
void _item_selected();
void _hide_requested();

View File

@ -4409,21 +4409,29 @@ Point2 Tree::get_scroll() const {
return ofs;
}
void Tree::scroll_to_item(TreeItem *p_item) {
void Tree::scroll_to_item(TreeItem *p_item, bool p_center_on_item) {
if (!is_visible_in_tree()) {
// hack to work around crash in get_item_rect() if Tree is not in tree.
return;
return; // Hack to work around crash in get_item_rect() if Tree is not in tree.
}
// make sure the scrollbar min and max are up to date with latest changes.
update_scrollbars();
const Rect2 r = get_item_rect(p_item);
const real_t tree_height = get_size().y;
const Rect2 item_rect = get_item_rect(p_item);
const real_t item_y = item_rect.position.y;
const real_t item_height = item_rect.size.y + cache.vseparation;
if (r.position.y <= v_scroll->get_value()) {
v_scroll->set_value(r.position.y);
} else if (r.position.y + r.size.y + 2 * cache.vseparation > v_scroll->get_value() + get_size().y) {
v_scroll->set_value(r.position.y + r.size.y + 2 * cache.vseparation - get_size().y);
if (p_center_on_item) {
v_scroll->set_value(item_y - (tree_height - item_height) / 2.0f);
} else {
if (item_y < v_scroll->get_value()) {
v_scroll->set_value(item_y);
} else {
const real_t new_position = item_y + item_height - tree_height;
if (new_position > v_scroll->get_value()) {
v_scroll->set_value(new_position);
}
}
}
}
@ -4868,7 +4876,7 @@ void Tree::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_column_title_language", "column"), &Tree::get_column_title_language);
ClassDB::bind_method(D_METHOD("get_scroll"), &Tree::get_scroll);
ClassDB::bind_method(D_METHOD("scroll_to_item", "item"), &Tree::scroll_to_item);
ClassDB::bind_method(D_METHOD("scroll_to_item", "item", "center_on_item"), &Tree::scroll_to_item, DEFVAL(false));
ClassDB::bind_method(D_METHOD("set_h_scroll_enabled", "h_scroll"), &Tree::set_h_scroll_enabled);
ClassDB::bind_method(D_METHOD("is_h_scroll_enabled"), &Tree::is_h_scroll_enabled);

View File

@ -682,7 +682,7 @@ public:
TreeItem *get_item_with_text(const String &p_find) const;
Point2 get_scroll() const;
void scroll_to_item(TreeItem *p_item);
void scroll_to_item(TreeItem *p_item, bool p_center_on_item = false);
void set_h_scroll_enabled(bool p_enable);
bool is_h_scroll_enabled() const;
void set_v_scroll_enabled(bool p_enable);