godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Improve TextureRegionEditor

Browse Source
This commit is contained in:
kobewi
2022-05-26 03:59:16 +02:00
parent 2e8862887c
commit e748fc1a11
2 changed files with 19 additions and 8 deletions
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)); mtx.scale_basis(Vector2(draw_zoom, draw_zoom));
RS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), mtx); 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()); edit_draw->draw_texture(base_tex, Point2());
RS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), Transform2D()); 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; 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()) { if (node_ninepatch || obj_styleBox.is_valid()) {
float margins[4] = { 0 }; float margins[4] = { 0 };
if (node_ninepatch) { if (node_ninepatch) {
@@ -922,7 +931,8 @@ void TextureRegionEditor::edit(Object *p_obj) {
atlas_tex = Ref<AtlasTexture>(nullptr); atlas_tex = Ref<AtlasTexture>(nullptr);
} }
edit_draw->update(); edit_draw->update();
popup_centered_ratio(); popup_centered_ratio(0.5);
request_center = true;
} }
void TextureRegionEditor::_texture_changed() { 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; UndoRedo *undo_redo = nullptr;
Vector2 draw_ofs; Vector2 draw_ofs;
float draw_zoom; float draw_zoom = 0.0;
bool updating_scroll; bool updating_scroll = false;
int snap_mode; int snap_mode = 0;
Vector2 snap_offset; Vector2 snap_offset;
Vector2 snap_step; Vector2 snap_step;
Vector2 snap_separation; Vector2 snap_separation;
@@ -88,15 +88,16 @@ class TextureRegionEditor : public AcceptDialog {
Rect2 rect; Rect2 rect;
Rect2 rect_prev; Rect2 rect_prev;
float prev_margin = 0.0f; float prev_margin = 0.0f;
int edited_margin; int edited_margin = 0;
HashMap<RID, List<Rect2>> cache_map; HashMap<RID, List<Rect2>> cache_map;
List<Rect2> autoslice_cache; List<Rect2> autoslice_cache;
bool autoslice_is_dirty; bool autoslice_is_dirty = false;
bool drag; bool drag = false;
bool creating = false; bool creating = false;
Vector2 drag_from; Vector2 drag_from;
int drag_index; int drag_index = 0;
bool request_center = false;
Ref<ViewPanner> panner; Ref<ViewPanner> panner;
void _scroll_callback(Vector2 p_scroll_vec, bool p_alt); void _scroll_callback(Vector2 p_scroll_vec, bool p_alt);