mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Amend 1668693bc
This commit is contained in:
parent
8103582b65
commit
ca46e5d959
3 changed files with 3 additions and 2 deletions
|
|
@ -219,7 +219,7 @@ static void ImGui_ImplSDL2_PlatformSetImeData(ImGuiContext*, ImGuiViewport* view
|
||||||
{
|
{
|
||||||
SDL_Rect r;
|
SDL_Rect r;
|
||||||
r.x = (int)(data->InputPos.x - viewport->Pos.x);
|
r.x = (int)(data->InputPos.x - viewport->Pos.x);
|
||||||
r.y = (int)(data->InputPos.y - viewport->Pos.y + data->InputLineHeight);
|
r.y = (int)(data->InputPos.y - viewport->Pos.y);
|
||||||
r.w = 1;
|
r.w = 1;
|
||||||
r.h = (int)data->InputLineHeight;
|
r.h = (int)data->InputLineHeight;
|
||||||
SDL_SetTextInputRect(&r);
|
SDL_SetTextInputRect(&r);
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@ static void ImGui_ImplSDL3_UpdateIme()
|
||||||
viewport_pos = viewport->Pos;
|
viewport_pos = viewport->Pos;
|
||||||
SDL_Rect r;
|
SDL_Rect r;
|
||||||
r.x = (int)(data->InputPos.x - viewport_pos.x);
|
r.x = (int)(data->InputPos.x - viewport_pos.x);
|
||||||
r.y = (int)(data->InputPos.y - viewport_pos.y + data->InputLineHeight);
|
r.y = (int)(data->InputPos.y - viewport_pos.y);
|
||||||
r.w = 1;
|
r.w = 1;
|
||||||
r.h = (int)data->InputLineHeight;
|
r.h = (int)data->InputLineHeight;
|
||||||
SDL_SetTextInputArea(window, &r, 0);
|
SDL_SetTextInputArea(window, &r, 0);
|
||||||
|
|
|
||||||
|
|
@ -185,6 +185,7 @@ Docking+Viewports Branch:
|
||||||
gamepad/keyboard to move a window to another viewport. (#9053) [@lut0pia, @ocornut]
|
gamepad/keyboard to move a window to another viewport. (#9053) [@lut0pia, @ocornut]
|
||||||
- Fixed implicit/fallback "Debug" window from staying visible if once docked. (#9151)
|
- Fixed implicit/fallback "Debug" window from staying visible if once docked. (#9151)
|
||||||
- Backends:
|
- Backends:
|
||||||
|
- SDL2, SDL3: adjust IME offset to match other backends and master branch. (#6071, #1953)
|
||||||
- Win32: viewports created by backend forcefully direct messages to
|
- Win32: viewports created by backend forcefully direct messages to
|
||||||
DefWindowProcW() in order to support Unicode text input. (#9099, #3653, #5961) [@ulhc]
|
DefWindowProcW() in order to support Unicode text input. (#9099, #3653, #5961) [@ulhc]
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue