Skip to content

Added addTextExtended and addTextExtendedUnformatted for additional AddText Functionalities #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 31, 2025
+62 −0
Merged

Added addTextExtended and addTextExtendedUnformatted for additional AddText Functionalities #55

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f9accd7
- Added PlotLines and PlotHistogram
Logickin-Lambda Jul 28, 2025
d9c2b30
- Tested the two native plotting function
Logickin-Lambda Jul 28, 2025
7339c92
- Removed My Private Example gitignore item
Logickin-Lambda Jul 28, 2025
08cb42e
- Renamed PlotNative with PlotArgs
Logickin-Lambda Jul 28, 2025
1f846a9
- Added extended AddTextFunction
Logickin-Lambda Jul 29, 2025
0aef646
- Fixed errors appeared during testing
Logickin-Lambda Jul 29, 2025
859591f
Merge branch 'zig-gamedev:main' into main
Logickin-Lambda Jul 29, 2025
bb26e05
- Updated Code to prevent null pointer dereference
Logickin-Lambda Jul 29, 2025
6677213
Merge branch 'main' of https://github.com/Logickin-Lambda/zgui
Logickin-Lambda Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions src/gui.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4551,6 +4551,53 @@ pub const DrawList = *opaque {
text: [*]const u8,
text_end: [*]const u8,
) void;
const AddTextArgs = struct {
font: ?Font,
font_size: f32,
wrap_width: f32 = 0,
cpu_fine_clip_rect: ?[*]const [4]f32 = null,
};
pub fn addTextExtended(
draw_list: DrawList,
pos: [2]f32,
col: u32,
comptime fmt: []const u8,
args: anytype,
add_text_args: AddTextArgs,
) void {
const txt = format(fmt, args);
addTextExtendedUnformatted(draw_list, pos, col, txt, add_text_args);
}
pub fn addTextExtendedUnformatted(
draw_list: DrawList,
pos: [2]f32,
col: u32,
txt: []const u8,
add_text_args: AddTextArgs,
) void {
zguiDrawList_AddTextExtended(
draw_list,
add_text_args.font,
add_text_args.font_size,
&pos,
col,
txt.ptr,
txt.ptr + txt.len,
add_text_args.wrap_width,
add_text_args.cpu_fine_clip_rect,
);
}
extern fn zguiDrawList_AddTextExtended(
draw_list: DrawList,
font: ?Font,
font_size: f32,
pos: *const [2]f32,
col: u32,
text: [*]const u8,
text_end: [*]const u8,
wrap_width: f32,
cpu_fine_clip_rect: ?[*]const [4]f32,
) void;
//----------------------------------------------------------------------------------------------
pub fn addPolyline(draw_list: DrawList, points: []const [2]f32, args: struct {
col: u32,
Expand Down
14 changes: 14 additions & 0 deletions src/zgui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2519,6 +2519,20 @@ extern "C"
draw_list->AddText({pos[0], pos[1]}, col, text_begin, text_end);
}

ZGUI_API void zguiDrawList_AddTextExtended(
ImDrawList *draw_list,
ImFont* font,
float font_size,
const float pos[2],
ImU32 col,
const char* text_begin,
const char* text_end,
float wrap_width,
const float cpu_fine_clip_rect[][4])
{
draw_list->AddText(font, font_size, {pos[0], pos[1]}, col, text_begin, text_end, wrap_width, (const ImVec4 *)&cpu_fine_clip_rect[0][0]);
Copy link

Copilot AI Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potential null pointer dereference. When 'cpu_fine_clip_rect' is null, accessing '&cpu_fine_clip_rect[0][0]' will cause undefined behavior. The cast should handle the null case properly.

Suggested change
draw_list->AddText(font, font_size, {pos[0], pos[1]}, col, text_begin, text_end, wrap_width, (const ImVec4 *)&cpu_fine_clip_rect[0][0]);
const ImVec4* clip_rect = (cpu_fine_clip_rect != nullptr) ? (const ImVec4 *)&cpu_fine_clip_rect[0][0] : nullptr;
draw_list->AddText(font, font_size, {pos[0], pos[1]}, col, text_begin, text_end, wrap_width, clip_rect);

Copilot uses AI. Check for mistakes.
Copy link
Member

@hazeycode hazeycode Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch bot

Copy link
Contributor Author

@Logickin-Lambda Logickin-Lambda Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, will change the name, and try to apply that suggestion for clip_rect to see if that works.

Copy link
Member

@hazeycode hazeycode Jul 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the naming is good as is?

Copy link
Contributor Author

@Logickin-Lambda Logickin-Lambda Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I thought the copilot suggests to rename the struct. If the name change isn't needed, then I am going to commit the suggested fix to the null pointer dereference only.

Copy link
Contributor Author

@Logickin-Lambda Logickin-Lambda Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here you go; the suggestion is applied.

}

ZGUI_API void zguiDrawList_AddPolyline(
ImDrawList *draw_list,
const float points[][2],
Expand Down
Loading