fix RenderText cpu_fine_clip char_rect

zhobo63 · Aug 12, 2024 · 92d966a · 92d966a
1 parent aff1513
commit 92d966a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11,862 deletions.
diff --git a/imgui/imgui_user.cpp b/imgui/imgui_user.cpp
@@ -633,10 +633,12 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col
 		//x=ceilf(x);
 		//y=ceilf(y);
 		ImVec2 px((x+glyph->X0), (y+glyph->Y0));
-		ImVec2 ps(px.x + glyph->X1, px.y + glyph->Y1);
-		if(cpu_fine_clip && !InRect(px, ps, clip_rect))	{
+		ImVec2 py((x+glyph->AdvanceX), (y+FontSize));
+
+		if(cpu_fine_clip && !InRect(px, py, clip_rect))	{
 
 		}else {
+			ImVec2 ps(px.x + glyph->X1, px.y + glyph->Y1);	
 			ImVec2 uv0(glyph->U0, glyph->V0);
 			ImVec2 uv1(glyph->U1, glyph->V1);
 			draw_list->AddImage(glyph->TexID, px, ps, uv0, uv1, col);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zhobo63/imgui-ts",
-  "version": "0.1.44",
+  "version": "0.1.45",
   "description": "JavaScript bindings for Dear ImGui using Emscripten and TypeScript, modulized with webpack from imgui-js",
   "main": "./src/index",
   "scripts": {

diff --git a/src/bind-imgui.js b/src/bind-imgui.js
diff --git a/src/index.ts b/src/index.ts
@@ -3,7 +3,7 @@ import * as ImGui_Impl from "./imgui_impl"
 
 export {ImGui, ImGui_Impl}
 
-export const version="0.1.44";
+export const version="0.1.45";
 
 export function ImGuiObject(obj:any, id:number=0):number
 {