|
|
@@ -262,6 +262,8 @@
|
|
|
Here is a change-log of API breaking changes, if you are using one of the functions listed, expect to have to fix some code.
|
|
|
Also read releases logs https://github.com/ocornut/imgui/releases for more details.
|
|
|
|
|
|
+ - 2018/XX/XX (1.XX) - Moved IME support functions from io.ImeSetInputScreenPosFn, io.ImeWindowHandle to the PlatformIO api.
|
|
|
+
|
|
|
- 2018/04/09 (1.61) - IM_DELETE() helper function added in 1.60 doesn't clear the input _pointer_ reference, more consistent with expectation and allows passing r-value.
|
|
|
- 2018/03/20 (1.60) - Renamed io.WantMoveMouse to io.WantSetMousePos for consistency and ease of understanding (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch).
|
|
|
- 2018/03/12 (1.60) - Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now.
|
|
|
@@ -617,10 +619,7 @@
|
|
|
Otherwise you can convert yourself to UTF-8 or load text data from file already saved as UTF-8.
|
|
|
|
|
|
Text input: it is up to your application to pass the right character code by calling
|
|
|
- io.AddInputCharacter(). The applications in examples/ are doing that. For languages relying
|
|
|
- on an Input Method Editor (IME), on Windows you can copy the Hwnd of your application in the
|
|
|
- io.ImeWindowHandle field. The default implementation of io.ImeSetInputScreenPosFn() will set
|
|
|
- your Microsoft IME position correctly.
|
|
|
+ io.AddInputCharacter(). The applications in examples/ are doing that.
|
|
|
|
|
|
Q: How can I use the drawing facilities without an ImGui window? (using ImDrawList API)
|
|
|
A: - You can create a dummy window. Call SetNextWindowBgAlpha(0.0f), call Begin() with NoTitleBar|NoResize|NoMove|NoScrollbar|NoSavedSettings|NoInputs flags.
|
|
|
@@ -771,7 +770,6 @@ static void SetCurrentViewport(ImGuiViewportP* viewport);
|
|
|
|
|
|
static const char* GetClipboardTextFn_DefaultImpl(void* user_data);
|
|
|
static void SetClipboardTextFn_DefaultImpl(void* user_data, const char* text);
|
|
|
-static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y);
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
// Context
|
|
|
@@ -907,8 +905,6 @@ ImGuiIO::ImGuiIO()
|
|
|
GetClipboardTextFn = GetClipboardTextFn_DefaultImpl; // Platform dependent default implementations
|
|
|
SetClipboardTextFn = SetClipboardTextFn_DefaultImpl;
|
|
|
ClipboardUserData = NULL;
|
|
|
- ImeSetInputScreenPosFn = ImeSetInputScreenPosFn_DefaultImpl;
|
|
|
- ImeWindowHandle = NULL;
|
|
|
|
|
|
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
|
RenderDrawListsFn = NULL;
|
|
|
@@ -3924,7 +3920,8 @@ void ImGui::NewFrame()
|
|
|
|
|
|
g.MouseCursor = ImGuiMouseCursor_Arrow;
|
|
|
g.WantCaptureMouseNextFrame = g.WantCaptureKeyboardNextFrame = g.WantTextInputNextFrame = -1;
|
|
|
- g.OsImePosRequest = ImVec2(1.0f, 1.0f); // OS Input Method Editor showing on top-left of our window by default
|
|
|
+ g.PlatformImePos = ImVec2(1.0f, 1.0f); // OS Input Method Editor showing on top-left of our window by default
|
|
|
+ g.PlatformImePosViewport = NULL;
|
|
|
|
|
|
// Mouse wheel scrolling, scale
|
|
|
if (g.HoveredWindow && !g.HoveredWindow->Collapsed && (g.IO.MouseWheel != 0.0f || g.IO.MouseWheelH != 0.0f))
|
|
|
@@ -4464,10 +4461,11 @@ void ImGui::EndFrame()
|
|
|
return;
|
|
|
|
|
|
// Notify OS when our Input Method Editor cursor has moved (e.g. CJK inputs using Microsoft IME)
|
|
|
- if (g.IO.ImeSetInputScreenPosFn && ImLengthSqr(g.OsImePosRequest - g.OsImePosSet) > 0.0001f)
|
|
|
+ if (g.PlatformIO.Platform_SetImeInputPos && g.PlatformImePosViewport != NULL && ImLengthSqr(g.PlatformImePos - g.PlatformImeLastPos) > 0.0001f)
|
|
|
{
|
|
|
- g.IO.ImeSetInputScreenPosFn((int)g.OsImePosRequest.x, (int)g.OsImePosRequest.y);
|
|
|
- g.OsImePosSet = g.OsImePosRequest;
|
|
|
+ g.PlatformIO.Platform_SetImeInputPos(g.PlatformImePosViewport, g.PlatformImePos);
|
|
|
+ g.PlatformImeLastPos = g.PlatformImePos;
|
|
|
+ g.PlatformImePosViewport = NULL;
|
|
|
}
|
|
|
|
|
|
// Hide implicit "Debug" window if it hasn't been used
|
|
|
@@ -11316,7 +11314,10 @@ bool ImGui::InputTextEx(const char* label, char* buf, int buf_size, const ImVec2
|
|
|
|
|
|
// Notify OS of text input position for advanced IME (-1 x offset so that Windows IME can cover our cursor. Bit of an extra nicety.)
|
|
|
if (is_editable)
|
|
|
- g.OsImePosRequest = ImVec2(cursor_screen_pos.x - 1, cursor_screen_pos.y - g.FontSize);
|
|
|
+ {
|
|
|
+ g.PlatformImePos = ImVec2(cursor_screen_pos.x - 1, cursor_screen_pos.y - g.FontSize);
|
|
|
+ g.PlatformImePosViewport = window->Viewport;
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -14027,34 +14028,6 @@ static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
|
|
|
|
|
|
#endif
|
|
|
|
|
|
-// Win32 API IME support (for Asian languages, etc.)
|
|
|
-#if defined(_WIN32) && !defined(__GNUC__) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS)
|
|
|
-
|
|
|
-#include <imm.h>
|
|
|
-#ifdef _MSC_VER
|
|
|
-#pragma comment(lib, "imm32")
|
|
|
-#endif
|
|
|
-
|
|
|
-static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y)
|
|
|
-{
|
|
|
- // Notify OS Input Method Editor of text input position
|
|
|
- if (HWND hwnd = (HWND)GImGui->IO.ImeWindowHandle)
|
|
|
- if (HIMC himc = ImmGetContext(hwnd))
|
|
|
- {
|
|
|
- COMPOSITIONFORM cf;
|
|
|
- cf.ptCurrentPos.x = x;
|
|
|
- cf.ptCurrentPos.y = y;
|
|
|
- cf.dwStyle = CFS_FORCE_POSITION;
|
|
|
- ImmSetCompositionWindow(himc, &cf);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-#else
|
|
|
-
|
|
|
-static void ImeSetInputScreenPosFn_DefaultImpl(int, int) {}
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
//-----------------------------------------------------------------------------
|
|
|
// HELP
|
|
|
//-----------------------------------------------------------------------------
|
omar