Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-11 05:19:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small improvements and simplifications for PaintCanvas.

Browse Source
This commit is contained in:
Relintai 2022-06-21 14:42:51 +02:00
parent 0483521818
commit 328af63ad1
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
modules/paint/paint_canvas.cpp
View File

@ -211,9 +211,7 @@ void PaintCanvas::clear_active_layer() {
} }
} }
void PaintCanvas::clear_preview_layer() { void PaintCanvas::clear_preview_layer() {
if (preview_layer.is_valid()) { preview_layer->clear();
preview_layer->clear();
}
} }
void PaintCanvas::clear_layer(const String &layer_name) { void PaintCanvas::clear_layer(const String &layer_name) {
@ -240,7 +238,7 @@ Ref<PaintCanvasLayer> PaintCanvas::remove_layer(const String &layer_name) {
ERR_CONTINUE(!layer.is_valid()); ERR_CONTINUE(!layer.is_valid());
if (layer == preview_layer || layer == active_layer || layer == tool_layer) { if (layer == active_layer) {
continue; continue;
} }
@ -268,25 +266,19 @@ Ref<PaintCanvasLayer> PaintCanvas::add_new_layer(const String &layer_name) {
layer.instance(); layer.instance();
layer->name = layer_name; layer->name = layer_name;
if (layer_name == "Preview") { TextureRect *texture_rect = memnew(TextureRect);
layer->create(preview_layer_rect, _canvas_width, _canvas_height); texture_rect->set_name(layer_name);
} else if (layer_name == "Tool") { canvas_layers->add_child(texture_rect, true);
layer->create(tool_preview_layer_rect, _canvas_width, _canvas_height);
} else {
TextureRect *texture_rect = memnew(TextureRect);
texture_rect->set_name(layer_name);
canvas_layers->add_child(texture_rect, true);
texture_rect->set_expand(true); texture_rect->set_expand(true);
texture_rect->set_anchors_and_margins_preset(Control::PRESET_WIDE); texture_rect->set_anchors_and_margins_preset(Control::PRESET_WIDE);
texture_rect->set_margin(Margin::MARGIN_RIGHT, 0); //texture_rect->set_margin(Margin::MARGIN_RIGHT, 0);
texture_rect->set_margin(Margin::MARGIN_BOTTOM, 0); //texture_rect->set_margin(Margin::MARGIN_BOTTOM, 0);
texture_rect->set_mouse_filter(Control::MOUSE_FILTER_IGNORE); texture_rect->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
layer->create(texture_rect, _canvas_width, _canvas_height); layer->create(texture_rect, _canvas_width, _canvas_height);
layers.push_back(layer); layers.push_back(layer);
}
if (!active_layer.is_valid()) { if (!active_layer.is_valid()) {
active_layer = layer; active_layer = layer;
@ -584,8 +576,6 @@ void PaintCanvas::_notification(int p_what) {
//pixel_size = canvas_size; //pixel_size = canvas_size;
active_layer = add_new_layer("Layer1"); active_layer = add_new_layer("Layer1");
preview_layer = add_new_layer("Preview");
tool_layer = add_new_layer("Tool");
////hack ////hack
//_canvas_width = 0; //_canvas_width = 0;
@ -625,21 +615,24 @@ PaintCanvas::PaintCanvas() {
canvas_background->set_texture(make_icon(grid_png)); canvas_background->set_texture(make_icon(grid_png));
canvas_background->set_expand(true); canvas_background->set_expand(true);
canvas_background->set_stretch_mode(TextureRect::STRETCH_TILE); canvas_background->set_stretch_mode(TextureRect::STRETCH_TILE);
canvas_background->set_draw_behind_parent(true); //canvas_background->set_draw_behind_parent(true);
add_child(canvas_background); add_child(canvas_background);
canvas_layers = memnew(Control); canvas_layers = memnew(Control);
canvas_layers->set_mouse_filter(Control::MOUSE_FILTER_IGNORE); canvas_layers->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
canvas_layers->set_anchors_and_margins_preset(Control::PRESET_WIDE);
add_child(canvas_layers); add_child(canvas_layers);
preview_layer_rect = memnew(TextureRect); preview_layer_rect = memnew(TextureRect);
preview_layer_rect->set_expand(true); preview_layer_rect->set_expand(true);
preview_layer_rect->set_mouse_filter(Control::MOUSE_FILTER_IGNORE); preview_layer_rect->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
preview_layer_rect->set_anchors_and_margins_preset(Control::PRESET_WIDE);
add_child(preview_layer_rect); add_child(preview_layer_rect);
tool_preview_layer_rect = memnew(TextureRect); tool_preview_layer_rect = memnew(TextureRect);
tool_preview_layer_rect->set_expand(true); tool_preview_layer_rect->set_expand(true);
tool_preview_layer_rect->set_mouse_filter(Control::MOUSE_FILTER_IGNORE); tool_preview_layer_rect->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
tool_preview_layer_rect->set_anchors_and_margins_preset(Control::PRESET_WIDE);
add_child(tool_preview_layer_rect); add_child(tool_preview_layer_rect);
grid = memnew(PaintVisualGrid); grid = memnew(PaintVisualGrid);
@ -652,6 +645,13 @@ PaintCanvas::PaintCanvas() {
canvas_outline->color = Color(0, 1, 0, 1); canvas_outline->color = Color(0, 1, 0, 1);
canvas_outline->set_mouse_filter(Control::MOUSE_FILTER_IGNORE); canvas_outline->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
add_child(canvas_outline); add_child(canvas_outline);
preview_layer.instance();
tool_layer.instance();
preview_layer->name = "Preview";
tool_layer->name = "Tool";
preview_layer->create(preview_layer_rect, _canvas_width, _canvas_height);
tool_layer->create(tool_preview_layer_rect, _canvas_width, _canvas_height);
} }
PaintCanvas::~PaintCanvas() { PaintCanvas::~PaintCanvas() {