eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-06 16:00:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed calculation of font size from monitor resolution.

Browse Source
This commit is contained in:
brunoherbelin
2020-05-10 20:24:04 +02:00
parent 1b8e3accea
commit 4303f4ba4d
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
RenderingManager.cpp
View File

@@ -358,6 +358,28 @@ glm::vec3 Rendering::unProject(glm::vec2 screen_coordinate, glm::mat4 modelview)
float Rendering::Width() { return main_window_attributes_.viewport.x; }
float Rendering::Height() { return main_window_attributes_.viewport.y; }
float Rendering::MonitorWidth()
{
GLFWmonitor *monitor = glfwGetWindowMonitor (main_window_);
if (!monitor)
monitor = glfwGetPrimaryMonitor ();
int xpos, ypos, width, height;
glfwGetMonitorWorkarea(monitor, &xpos, &ypos, &width, &height);
return width;
}
float Rendering::MonitorHeight()
{
GLFWmonitor *monitor = glfwGetWindowMonitor (main_window_);
if (!monitor)
monitor = glfwGetPrimaryMonitor ();
int xpos, ypos, width, height;
glfwGetMonitorWorkarea(monitor, &xpos, &ypos, &width, &height);
return height;
}
void Rendering::ToggleFullscreen()
{
// if in fullscreen mode

3
RenderingManager.h
View File

@@ -84,6 +84,9 @@ public:
// for opengl pipeline in gstreamer
void LinkPipeline( GstPipeline *pipeline );
float MonitorWidth();
float MonitorHeight();
private:
// loop update to begin new frame

4
UserInterfaceManager.cpp
View File

@@ -154,8 +154,8 @@ bool UserInterface::Init()
ImGuiToolkit::SetAccentColor(static_cast<ImGuiToolkit::accent_color>(Settings::application.accent_color));
// Load Fonts (using resource manager, NB: a temporary copy of the raw data is necessary)
int base_font_size = int ( Rendering::manager().Height() / 90.f );
Log::Info("Base font size %d", base_font_size);
int base_font_size = int ( Rendering::manager().MonitorHeight() / 90.f );
Log::Info("Base font size %d (%.1f)", base_font_size, Rendering::manager().MonitorHeight());
ImGuiToolkit::SetFont(ImGuiToolkit::FONT_DEFAULT, "Roboto-Regular", base_font_size);
ImGuiToolkit::SetFont(ImGuiToolkit::FONT_BOLD, "Roboto-Bold", base_font_size);
ImGuiToolkit::SetFont(ImGuiToolkit::FONT_ITALIC, "Roboto-Italic", base_font_size);