[fonts] Remove TODO's with font stuff

This commit is contained in:
SpaiR committed 2020-02-10 22:03:36 +03:00
1 parent 058928856a
commit 01b7bec5b2
2 files changed
+66 -7

No files matched your search

+29 -4
View File
@@ -25,6 +25,8 @@ public final class ImGui {
private static final ImDrawList IM_DRAW_LIST_BACKGROUND = new ImDrawList(ImDrawList.TYPE_BACKGROUND);
private static final ImDrawList IM_DRAW_LIST_FOREGROUND = new ImDrawList(ImDrawList.TYPE_FOREGROUND);
private static ImFont font;
static {
final String libPath = System.getProperty(LIB_PATH_PROP);
final String libName = System.getProperty(LIB_NAME_PROP, LIB_NAME_DEFAULT);
@@ -123,7 +125,13 @@ public final class ImGui {
ImGui::CreateContext();
*/
// public static void CreateContext(ImFontAtlas sharedFontAtlas) TODO create context with fonts
public static void createContext(ImFontAtlas sharedFontAtlas) {
nCreateContext(sharedFontAtlas.ptr);
}
private static native void nCreateContext(long sharedFontAtlasPtr); /*
ImGui::CreateContext((ImFontAtlas*)sharedFontAtlasPtr);
*/
public static native void destroyContext(); /*
ImGui::DestroyContext();
@@ -785,7 +793,13 @@ public final class ImGui {
// Parameters stacks (shared)
// TODO void PushFont(ImFont* font);
public static void pushFont(ImFont font) {
nPushFont(font.ptr);
}
private static native void nPushFont(long fontPtr); /*
ImGui::PushFont((ImFont*)fontPtr);
*/
public static native void popFont(); /*
ImGui::PopFont();
@@ -831,7 +845,19 @@ public final class ImGui {
Jni::ImVec4Cpy(env, ImGui::GetStyleColorVec4(imGuiStyleVar), dstImVec4);
*/
// TODO ImFont* GetFont();
/**
* Get current font.
*/
public static ImFont getFont() {
if (font == null) {
font = new ImFont(nGetFont());
}
return font;
}
private static native long nGetFont(); /*
return (long)ImGui::GetFont();
*/
/**
* Get current font size (= height in pixels) of current font with current scale applied
@@ -3367,7 +3393,6 @@ public final class ImGui {
*/
// Widgets: List Boxes
// - FIXME: To be consistent with all the newer API, ListBoxHeader/ListBoxFooter should in reality be called BeginListBox/EndListBox. Will rename them.
public static void listBox(String label, ImInt currentItem, String[] items, int itemsCount) {
nListBox(label, currentItem.data, items, itemsCount, -1);
+37 -3
View File
@@ -177,14 +177,48 @@ public final class ImGuiIO {
*/
public void setFonts(final ImFontAtlas imFontAtlas) {
this.imFontAtlas = imFontAtlas;
nSetImFontAtlas(imFontAtlas.ptr);
nSetFonts(imFontAtlas.ptr);
}
private native void nSetImFontAtlas(long imFontAtlasPtr); /*
private native void nSetFonts(long imFontAtlasPtr); /*
ImGui::GetIO().Fonts = (ImFontAtlas*)imFontAtlasPtr;
*/
// TODO fonts configuration
/**
* Global scale all fonts
*/
public native float getFontGlobalScale(); /*
return ImGui::GetIO().FontGlobalScale;
*/
/**
* Global scale all fonts
*/
public native void setFontGlobalScale(float fontGlobalScale); /*
ImGui::GetIO().FontGlobalScale = fontGlobalScale;
*/
/**
* Allow user scaling text of individual window with CTRL+Wheel.
*/
public native boolean getFontAllowUserScaling(); /*
return ImGui::GetIO().FontAllowUserScaling;
*/
/**
* Allow user scaling text of individual window with CTRL+Wheel.
*/
public native void setFontAllowUserScaling(boolean fontAllowUserScaling); /*
ImGui::GetIO().FontAllowUserScaling = fontAllowUserScaling;
*/
public void setFontDefault(final ImFont fontDefault) {
nSetFontDefault(fontDefault.ptr);
}
private native void nSetFontDefault(long fontDefaultPtr); /*
ImGui::GetIO().FontDefault = (ImFont*)fontDefaultPtr;
*/
// Miscellaneous options