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

expose Itemlist.move_item and optimize functionality

Browse source
This commit is contained in:
Alexander Holland 2018-03-13 15:19:04 +01:00
parent 4f1b87265e
commit 73146af740
2 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
scene/gui/item_list.cpp
View file

@ -295,35 +295,21 @@ int ItemList::get_current() const {
return current; return current;
} }
void ItemList::move_item(int p_item, int p_to_pos) { void ItemList::move_item(int p_from_idx, int p_to_idx) {
ERR_FAIL_INDEX(p_item, items.size()); ERR_FAIL_INDEX(p_from_idx, items.size());
ERR_FAIL_INDEX(p_to_pos, items.size() + 1); ERR_FAIL_INDEX(p_to_idx, items.size());
Item it = items[p_item]; if (is_anything_selected() && get_selected_items()[0] == p_from_idx) {
items.remove(p_item); current = p_to_idx;
if (p_to_pos > p_item) {
p_to_pos--;
} }
if (p_to_pos >= items.size()) { Item item = items[p_from_idx];
items.push_back(it); items.remove(p_from_idx);
} else { items.insert(p_to_idx, item);
items.insert(p_to_pos, it);
}
if (current < 0) {
//do none
} else if (p_item == current) {
current = p_to_pos;
} else if (p_to_pos > p_item && current > p_item && current < p_to_pos) {
current--;
} else if (p_to_pos < p_item && current < p_item && current > p_to_pos) {
current++;
}
update(); update();
shape_changed = true;
} }
int ItemList::get_item_count() const { int ItemList::get_item_count() const {
@ -1426,6 +1412,8 @@ void ItemList::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_selected", "idx"), &ItemList::is_selected); ClassDB::bind_method(D_METHOD("is_selected", "idx"), &ItemList::is_selected);
ClassDB::bind_method(D_METHOD("get_selected_items"), &ItemList::get_selected_items); ClassDB::bind_method(D_METHOD("get_selected_items"), &ItemList::get_selected_items);
ClassDB::bind_method(D_METHOD("move_item", "p_from_idx", "p_to_idx"), &ItemList::move_item);
ClassDB::bind_method(D_METHOD("get_item_count"), &ItemList::get_item_count); ClassDB::bind_method(D_METHOD("get_item_count"), &ItemList::get_item_count);
ClassDB::bind_method(D_METHOD("remove_item", "idx"), &ItemList::remove_item); ClassDB::bind_method(D_METHOD("remove_item", "idx"), &ItemList::remove_item);

2
scene/gui/item_list.h
View file

@ -169,7 +169,7 @@ public:
void set_current(int p_current); void set_current(int p_current);
int get_current() const; int get_current() const;
void move_item(int p_item, int p_to_pos); void move_item(int p_from_idx, int p_to_idx);
int get_item_count() const; int get_item_count() const;
void remove_item(int p_idx); void remove_item(int p_idx);