Skip to content

Commit f555f84

Browse files
committed
Remove redundant "textEnd" argument from text methods
1 parent dd94f21 commit f555f84

File tree

2 files changed

+20
-41
lines changed

2 files changed

+20
-41
lines changed

imgui-binding/src/main/java/imgui/ImDrawList.java

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -191,45 +191,33 @@ public final class ImDrawList {
191191
IM_DRAW_LIST->AddNgonFilled(ImVec2(centreX, centreY), radius, col, numSegments);
192192
*/
193193

194-
public native void addText(float posX, float posY, int col, String textBegin); /*
195-
IM_DRAW_LIST->AddText(ImVec2(posX, posY), col, textBegin);
194+
public native void addText(float posX, float posY, int col, String text); /*
195+
IM_DRAW_LIST->AddText(ImVec2(posX, posY), col, text);
196196
*/
197197

198-
public native void addText(float posX, float posY, int col, String textBegin, String textEnd); /*
199-
IM_DRAW_LIST->AddText(ImVec2(posX, posY), col, textBegin, textEnd);
200-
*/
201-
202-
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String textBegin) {
203-
nAddText(imFont.ptr, fontSize, posX, posY, col, textBegin);
204-
}
205-
206-
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String textBegin); /*
207-
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, textBegin);
208-
*/
209-
210-
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String textBegin, final String textEnd) {
211-
nAddText(imFont.ptr, fontSize, posX, posY, col, textBegin, textEnd);
198+
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String text) {
199+
nAddText(imFont.ptr, fontSize, posX, posY, col, text);
212200
}
213201

214-
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String textBegin, String textEnd); /*
215-
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, textBegin, textEnd);
202+
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String text); /*
203+
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, text);
216204
*/
217205

218-
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String textBegin, final String textEnd, final float wrapWidth) {
219-
nAddText(imFont.ptr, fontSize, posX, posY, col, textBegin, textEnd, wrapWidth);
206+
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String text, final float wrapWidth) {
207+
nAddText(imFont.ptr, fontSize, posX, posY, col, text, wrapWidth);
220208
}
221209

222-
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String textBegin, String textEnd, float wrapWidth); /*
223-
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, textBegin, textEnd, wrapWidth);
210+
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String text, float wrapWidth); /*
211+
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, text, NULL, wrapWidth);
224212
*/
225213

226-
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String textBegin, final String textEnd, final float wrapWidth, final float cpuFineClipRectX, final float cpuFineClipRectY, final float cpuFineClipRectZ, final float cpuFineClipRectV) {
227-
nAddText(imFont.ptr, fontSize, posX, posY, col, textBegin, textEnd, wrapWidth, cpuFineClipRectX, cpuFineClipRectY, cpuFineClipRectZ, cpuFineClipRectV);
214+
public void addText(final ImFont imFont, final float fontSize, final float posX, final float posY, final int col, final String text, final float wrapWidth, final float cpuFineClipRectX, final float cpuFineClipRectY, final float cpuFineClipRectZ, final float cpuFineClipRectV) {
215+
nAddText(imFont.ptr, fontSize, posX, posY, col, text, wrapWidth, cpuFineClipRectX, cpuFineClipRectY, cpuFineClipRectZ, cpuFineClipRectV);
228216
}
229217

230-
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String textBegin, String textEnd, float wrapWidth, float cpuFineClipRectX, float cpuFineClipRectY, float cpuFineClipRectZ, float cpuFineClipRectV); /*
218+
private native void nAddText(long imFontPtr, float fontSize, float posX, float posY, int col, String text, float wrapWidth, float cpuFineClipRectX, float cpuFineClipRectY, float cpuFineClipRectZ, float cpuFineClipRectV); /*
231219
ImVec4 cpuFineClipRect = ImVec4(cpuFineClipRectX, cpuFineClipRectY, cpuFineClipRectZ, cpuFineClipRectV);
232-
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, textBegin, textEnd, wrapWidth, &cpuFineClipRect);
220+
IM_DRAW_LIST->AddText((ImFont*)imFontPtr, fontSize, ImVec2(posX, posY), col, text, NULL, wrapWidth, &cpuFineClipRect);
233221
*/
234222

235223
public native void addPolyline(ImVec2[] points, int numPoints, int col, boolean closed, float thickness); /*

imgui-binding/src/main/java/imgui/ImGui.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,15 +1326,6 @@ public static ImFont getFont() {
13261326
ImGui::TextUnformatted(text);
13271327
*/
13281328

1329-
/**
1330-
* Raw text without formatting. Roughly equivalent to Text("%s", text) but:
1331-
* A) doesn't require null terminated string if 'textEnd' is specified,
1332-
* B) it's faster, no memory copy is done, no buffer size limits, recommended for long chunks of text.
1333-
*/
1334-
public static native void textUnformatted(String text, String textEnd); /*
1335-
ImGui::TextUnformatted(text, textEnd);
1336-
*/
1337-
13381329
/**
13391330
* Formatted text
13401331
* <p>
@@ -4851,18 +4842,18 @@ public static ImGuiStorage getStateStorageNew() {
48514842
Jni::ImVec2Cpy(env, src, dstImVec2);
48524843
*/
48534844

4854-
public static native void calcTextSize(ImVec2 dstImVec2, String text, String textEnd); /*
4855-
ImVec2 src = ImGui::CalcTextSize(text, textEnd);
4845+
public static native void calcTextSize(ImVec2 dstImVec2, String text, boolean hideTextAfterDoubleHash); /*
4846+
ImVec2 src = ImGui::CalcTextSize(text, NULL, hideTextAfterDoubleHash);
48564847
Jni::ImVec2Cpy(env, src, dstImVec2);
48574848
*/
48584849

4859-
public static native void calcTextSize(ImVec2 dstImVec2, String text, String textEnd, boolean hideTextAfterDoubleHas); /*
4860-
ImVec2 src = ImGui::CalcTextSize(text, textEnd, hideTextAfterDoubleHas);
4850+
public static native void calcTextSize(ImVec2 dstImVec2, String text, float wrapWidth); /*
4851+
ImVec2 src = ImGui::CalcTextSize(text, NULL, false, wrapWidth);
48614852
Jni::ImVec2Cpy(env, src, dstImVec2);
48624853
*/
48634854

4864-
public static native void calcTextSize(ImVec2 dstImVec2, String text, String textEnd, boolean hideTextAfterDoubleHas, float wrapWidth); /*
4865-
ImVec2 src = ImGui::CalcTextSize(text, textEnd, hideTextAfterDoubleHas, wrapWidth);
4855+
public static native void calcTextSize(ImVec2 dstImVec2, String text, boolean hideTextAfterDoubleHash, float wrapWidth); /*
4856+
ImVec2 src = ImGui::CalcTextSize(text, NULL, hideTextAfterDoubleHash, wrapWidth);
48664857
Jni::ImVec2Cpy(env, src, dstImVec2);
48674858
*/
48684859

0 commit comments

Comments
 (0)