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

Fix zoom with touch breaking when canvas is scaled up

Browse source
This commit is contained in:
Yousef Khadadeh 2026-03-06 14:12:13 +03:00
parent 23347a5ee6
commit 32b84d0813
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/DrawCamera.cpp
View file

@ -58,6 +58,7 @@ void DrawCamera::scale_up(World& w, const WorldScalar& scaleUpAmount) {
startZoomVal *= scaleUpAmount;
startZoomMousePos *= scaleUpAmount;
startZoomCameraPos *= scaleUpAmount;
touchInitialC.scale_about({0, 0}, scaleUpAmount, true);
set_viewing_area(w.main.window.size.cast<float>());
}

22
src/InputManager.cpp
View file

@ -160,6 +160,8 @@ bool InputManager::Text::is_accepting_input() {
return !textBoxes.empty();
}
SDL_Rect r;
void InputManager::Text::update_accepting_input(SDL_Window* window) {
if(!textBoxes.empty()) {
auto& textbox = textBoxes.front();
@ -172,10 +174,14 @@ void InputManager::Text::update_accepting_input(SDL_Window* window) {
SDL_SetNumberProperty(propIDVal, SDL_PROP_TEXTINPUT_AUTOCORRECT_BOOLEAN, textbox.textInputProperties.autocorrect);
SDL_SetNumberProperty(propIDVal, SDL_PROP_TEXTINPUT_MULTILINE_BOOLEAN, textbox.textInputProperties.multiline);
SDL_SetNumberProperty(propIDVal, SDL_PROP_TEXTINPUT_ANDROID_INPUTTYPE_NUMBER, (textbox.textInputProperties.androidInputType & ANDROIDTEXT_TYPE_CLASS_NUMBER) ? ANDROIDTEXT_TYPE_CLASS_TEXT : textbox.textInputProperties.androidInputType);
r = textBoxes.front().rect->get_sdl_rect();
SDL_SetTextInputArea(window, &r, 0);
SDL_StartTextInputWithProperties(window, propIDVal);
}
else
else {
SDL_StopTextInput(window);
SDL_SetTextInputArea(window, nullptr, 0);
}
}
std::string InputManager::get_clipboard_str_SDL() {
@ -1169,13 +1175,13 @@ void InputManager::update() {
touch.touchEventType = Touch::ONE_FINGER_EVENT;
}
if(!text.textBoxes.empty()) {
auto& textbox = text.textBoxes.front();
if(textbox.rect) {
SDL_Rect r = textbox.rect->get_sdl_rect();
SDL_SetTextInputArea(main.window.sdlWindow, &r, textbox.cursor->pos.fTextByteIndex);
}
else
SDL_SetTextInputArea(main.window.sdlWindow, nullptr, textbox.cursor->pos.fTextByteIndex);
//auto& textbox = text.textBoxes.front();
//if(textbox.rect) {
// SDL_Rect r = textbox.rect->get_sdl_rect();
// //SDL_SetTextInputArea(main.window.sdlWindow, &r, textbox.cursor->pos.fTextByteIndex);
//}
//else
// //SDL_SetTextInputArea(main.window.sdlWindow, nullptr, textbox.cursor->pos.fTextByteIndex);
}
}