copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Changes related to text input on Android, general bug fixes, license change to GPLv3

Browse source
This commit is contained in:
Yousef Khadadeh 2026-05-11 23:06:39 +03:00
parent 8b3e321ab5
commit fc8f414b67
308 changed files with 8707 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/DrawingProgram/Tools/EditTool.cpp
View file

@ -1,3 +1,21 @@
/*
* InfiniPaint
* Copyright (C) 2025-2026 Yousef Khadadeh
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "EditTool.hpp"
#include "../DrawingProgram.hpp"
#include "../../MainProgram.hpp"
@ -45,9 +63,13 @@ void EditTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
auto& gui = drawP.world.main.g.gui;
gui.new_id("edit tool", [&] {
text_label_centered(gui, "Edit");
});
if(objInfoBeingEdited)
compEditTool->gui_phone_toolbox(t);
else {
gui.new_id("edit tool", [&] {
text_label_centered(gui, "Double tap object to edit");
});
}
}
void EditTool::erase_component(CanvasComponentContainer::ObjInfo* erasedComp) {
@ -60,6 +82,11 @@ void EditTool::input_paste_callback(const CustomEvents::PasteEvent& paste) {
compEditTool->input_paste_callback(paste);
}
void EditTool::input_android_text_box_input_callback(const CustomEvents::AndroidTextBoxInputEvent& textboxInput) {
if(objInfoBeingEdited)
compEditTool->input_android_text_box_input_callback(textboxInput);
}
void EditTool::input_text_key_callback(const InputManager::KeyCallbackArgs& key) {
if(objInfoBeingEdited)
compEditTool->input_text_key_callback(key);
@ -297,6 +324,23 @@ void EditTool::tool_update() {
}
}
Vector4f* EditTool::color_picker_color(Vector4f* oldColor) {
if(objInfoBeingEdited)
return compEditTool->color_picker_color(oldColor);
return nullptr;
}
bool EditTool::phone_gui_tool_specific_bottom_toolbar_exists() {
if(objInfoBeingEdited)
return compEditTool->phone_gui_tool_specific_bottom_toolbar_exists();
return false;
}
void EditTool::phone_gui_tool_specific_bottom_toolbar(PhoneDrawingProgramScreen& t) {
if(objInfoBeingEdited)
return compEditTool->phone_gui_tool_specific_bottom_toolbar(t);
}
bool EditTool::prevent_undo_or_redo() {
return objInfoBeingEdited || drawP.selection.is_something_selected();
}