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

Merge pull request #61429 from KoBeWi/texturegion

Browse source 
Improve TextureRegionEditor
This commit is contained in:
Rémi Verschelde 2022-05-26 22:34:30 +02:00 committed by GitHub
commit 155c6e909a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/plugins/texture_region_editor_plugin.cpp
View file

@ -83,6 +83,7 @@ void TextureRegionEditor::_region_draw() {
mtx.scale_basis(Vector2(draw_zoom, draw_zoom));
RS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), mtx);
edit_draw->draw_rect(Rect2(Point2(), base_tex->get_size()), Color(0.5, 0.5, 0.5, 0.5), false);
edit_draw->draw_texture(base_tex, Point2());
RS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), Transform2D());
@ -234,6 +235,14 @@ void TextureRegionEditor::_region_draw() {
updating_scroll = false;
if (request_center && hscroll->get_min() < 0) {
hscroll->set_value((hscroll->get_min() + hscroll->get_max() - hscroll->get_page()) / 2);
vscroll->set_value((vscroll->get_min() + vscroll->get_max() - vscroll->get_page()) / 2);
// This ensures that the view is updated correctly.
callable_bind(callable_mp(this, &TextureRegionEditor::_pan_callback), Vector2(1, 0)).call_deferred(nullptr, 0);
request_center = false;
}
if (node_ninepatch || obj_styleBox.is_valid()) {
float margins[4] = { 0 };
if (node_ninepatch) {
@ -922,7 +931,8 @@ void TextureRegionEditor::edit(Object *p_obj) {
atlas_tex = Ref<AtlasTexture>(nullptr);
}
edit_draw->update();
popup_centered_ratio();
popup_centered_ratio(0.5);
request_center = true;
}
void TextureRegionEditor::_texture_changed() {

15
editor/plugins/texture_region_editor_plugin.h
View file

@ -71,10 +71,10 @@ class TextureRegionEditor : public AcceptDialog {
UndoRedo *undo_redo = nullptr;
Vector2 draw_ofs;
float draw_zoom;
bool updating_scroll;
float draw_zoom = 0.0;
bool updating_scroll = false;
int snap_mode;
int snap_mode = 0;
Vector2 snap_offset;
Vector2 snap_step;
Vector2 snap_separation;
@ -88,15 +88,16 @@ class TextureRegionEditor : public AcceptDialog {
Rect2 rect;
Rect2 rect_prev;
float prev_margin = 0.0f;
int edited_margin;
int edited_margin = 0;
HashMap<RID, List<Rect2>> cache_map;
List<Rect2> autoslice_cache;
bool autoslice_is_dirty;
bool autoslice_is_dirty = false;
bool drag;
bool drag = false;
bool creating = false;
Vector2 drag_from;
int drag_index;
int drag_index = 0;
bool request_center = false;
Ref<ViewPanner> panner;
void _scroll_callback(Vector2 p_scroll_vec, bool p_alt);