add mono font, swap sans to lighter

master
Clyne 3 years ago
parent 3da3e76f17
commit 1c5a7e71ce

Binary file not shown.

Binary file not shown.

@ -18,7 +18,8 @@
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <SDL2/SDL_opengl.h> #include <SDL2/SDL_opengl.h>
ImFont *font = nullptr; ImFont *fontSans = nullptr;
ImFont *fontMono = nullptr;
static ImGuiIO *io = nullptr; static ImGuiIO *io = nullptr;
static SDL_Window *window = nullptr; static SDL_Window *window = nullptr;
static decltype(SDL_GL_CreateContext(nullptr)) gl_context; static decltype(SDL_GL_CreateContext(nullptr)) gl_context;
@ -49,7 +50,8 @@ bool guiInitialize()
ImGui::CreateContext(); ImGui::CreateContext();
io = &ImGui::GetIO(); io = &ImGui::GetIO();
io->ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; io->ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
font = io->Fonts->AddFontFromFileTTF("fonts/Roboto-Medium.ttf", 20); fontSans = io->Fonts->AddFontFromFileTTF("fonts/Roboto-Regular.ttf", 20);
fontMono = io->Fonts->AddFontFromFileTTF("fonts/RobotoMono-Regular.ttf", 20);
ImGui::StyleColorsLight(); ImGui::StyleColorsLight();
ImGui_ImplSDL2_InitForOpenGL(window, gl_context); ImGui_ImplSDL2_InitForOpenGL(window, gl_context);

@ -20,7 +20,8 @@
#include <string> #include <string>
// Externs // Externs
extern ImFont *font; extern ImFont *fontSans;
extern ImFont *fontMono;
extern bool guiInitialize(); extern bool guiInitialize();
extern void guiHandleEvents(bool& done); extern void guiHandleEvents(bool& done);
@ -79,20 +80,22 @@ int main(int, char **)
ImGui::SetNextWindowSize({WINDOW_WIDTH, WINDOW_HEIGHT - 22 - 200}); ImGui::SetNextWindowSize({WINDOW_WIDTH, WINDOW_HEIGHT - 22 - 200});
ImGui::Begin("main", nullptr, ImGui::Begin("main", nullptr,
ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration); ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration);
ImGui::PushFont(font);
// Render main controls (order is important). // Render main controls (order is important).
ImGui::PushFont(fontSans);
codeRenderToolbar(); codeRenderToolbar();
deviceRenderToolbar(); deviceRenderToolbar();
fileRenderDialog(); fileRenderDialog();
codeRenderWidgets(); ImGui::PopFont();
ImGui::PushFont(fontMono);
codeRenderWidgets();
ImGui::SetNextWindowPos({0, WINDOW_HEIGHT - 200}); ImGui::SetNextWindowPos({0, WINDOW_HEIGHT - 200});
ImGui::SetNextWindowSize({WINDOW_WIDTH, 200}); ImGui::SetNextWindowSize({WINDOW_WIDTH, 200});
logView.Draw("log", nullptr, ImGuiWindowFlags_NoDecoration); logView.Draw("log", nullptr, ImGuiWindowFlags_NoDecoration);
ImGui::PopFont();
// Finish main view rendering. // Finish main view rendering.
ImGui::PopFont();
ImGui::End(); ImGui::End();
// Draw everything to the screen. // Draw everything to the screen.

Loading…
Cancel
Save