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

Fixed the tool layer.

Browse Source
This commit is contained in:
Relintai 2022-06-21 16:28:17 +02:00
parent 1ef976c007
commit 918a246ef4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/paint/paint_canvas_layer.cpp
View File

@ -117,8 +117,6 @@ void PaintCanvasLayer::update_texture() {
texture->create_from_image(image, 0); texture->create_from_image(image, 0);
texture_rect_ref->set_texture(texture); texture_rect_ref->set_texture(texture);
texture_rect_ref->set_margin(Margin::MARGIN_RIGHT, 0);
texture_rect_ref->set_margin(Margin::MARGIN_BOTTOM, 0);
} }
void PaintCanvasLayer::toggle_lock() { void PaintCanvasLayer::toggle_lock() {

7
modules/paint/paint_window.cpp
View File

@ -304,6 +304,7 @@ void PaintWindow::_draw_tool_brush() {
for (int i = 0; i < pixels.size(); ++i) { for (int i = 0; i < pixels.size(); ++i) {
Vector2i pixel = r[i]; Vector2i pixel = r[i];
paint_canvas->_set_pixel(paint_canvas->tool_layer, cell_mouse_position.x + pixel.x, cell_mouse_position.y + pixel.y, _selected_color); paint_canvas->_set_pixel(paint_canvas->tool_layer, cell_mouse_position.x + pixel.x, cell_mouse_position.y + pixel.y, _selected_color);
//print_error("ad " + String::num(cell_mouse_position.x + pixel.x) + " " + String::num(cell_mouse_position.y + pixel.y));
} }
r.release(); r.release();
@ -321,7 +322,7 @@ void PaintWindow::_draw_tool_brush() {
paint_canvas->update(); paint_canvas->update();
//TODO add here brush prefab drawing //TODO add here brush prefab drawing
paint_canvas->tool_layer->update_texture(); // paint_canvas->tool_layer->update_texture();
} }
void PaintWindow::_handle_scroll() { void PaintWindow::_handle_scroll() {
@ -983,7 +984,7 @@ void PaintWindow::_on_PaintCanvasContainer_mouse_entered() {
mouse_on_top = true; mouse_on_top = true;
paint_canvas->tool_layer->clear(); paint_canvas->tool_layer->clear();
paint_canvas->update(); paint_canvas->update();
paint_canvas->tool_layer->update_texture(); //paint_canvas->tool_layer->update_texture();
} }
void PaintWindow::_on_PaintCanvasContainer_mouse_exited() { void PaintWindow::_on_PaintCanvasContainer_mouse_exited() {
if (!mouse_on_top) { if (!mouse_on_top) {
@ -993,7 +994,7 @@ void PaintWindow::_on_PaintCanvasContainer_mouse_exited() {
mouse_on_top = false; mouse_on_top = false;
paint_canvas->tool_layer->clear(); paint_canvas->tool_layer->clear();
paint_canvas->update(); paint_canvas->update();
paint_canvas->tool_layer->update_texture(); //paint_canvas->tool_layer->update_texture();
} }
void PaintWindow::_on_ColorPicker_popup_closed() { void PaintWindow::_on_ColorPicker_popup_closed() {
color_grid->add_color_prefab(color_picker_button->get_pick_color()); color_grid->add_color_prefab(color_picker_button->get_pick_color());