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

Forgot to update tile transform buttons when picking tiles.

Browse source
This commit is contained in:
Carl Olsson 2015-02-03 19:51:21 +10:00
parent 52700563bc
commit afa13bf868
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/editor/plugins/tile_map_editor_plugin.cpp
View file

@ -127,7 +127,7 @@ void TileMapEditor::_update_palette() {
TreeItem *root = palette->create_item();
//palette->set_hide_root(true);
palette->set_hide_root(true);
List<int> tiles;
tileset->get_tile_list(&tiles);
@ -250,6 +250,7 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
mirror_x->set_pressed(node->is_cell_x_flipped(over_tile.x, over_tile.y));
mirror_y->set_pressed(node->is_cell_y_flipped(over_tile.x, over_tile.y));
transpose->set_pressed(node->is_cell_transposed(over_tile.x, over_tile.y));
_update_transform_buttons();
canvas_item_editor->update();
return true;
} else {
@ -394,6 +395,7 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
mirror_x->set_pressed(node->is_cell_x_flipped(over_tile.x, over_tile.y));
mirror_y->set_pressed(node->is_cell_y_flipped(over_tile.x, over_tile.y));
transpose->set_pressed(node->is_cell_transposed(over_tile.x, over_tile.y));
_update_transform_buttons();
canvas_item_editor->update();
return true;
}
@ -731,9 +733,9 @@ TileMapEditor::CellOp TileMapEditor::_get_op_from_cell(const Point2i& p_pos)
}
void TileMapEditor::_update_transform_buttons(Object *p_button) {
ERR_FAIL_NULL(p_button);
//ERR_FAIL_NULL(p_button);
ToolButton *b=p_button->cast_to<ToolButton>();
ERR_FAIL_COND(!b);
//ERR_FAIL_COND(!b);
mirror_x->set_block_signals(true);
mirror_y->set_block_signals(true);

2
tools/editor/plugins/tile_map_editor_plugin.h
View file

@ -111,7 +111,7 @@ protected:
void _node_removed(Node *p_node);
static void _bind_methods();
CellOp _get_op_from_cell(const Point2i& p_pos);
void _update_transform_buttons(Object *p_button);
void _update_transform_buttons(Object *p_button=0);
public:
HBoxContainer *get_canvas_item_editor_hb() const { return canvas_item_editor_hb; }