eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 22:09:19 +02:00
Code Issues 123 Wiki Activity

slightly better ui scaling

Browse Source
This commit is contained in:
milek7
2020-12-02 01:49:58 +01:00
parent ee5551a424
commit a182eec2a1
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
driveruipanels.cpp
View File

@@ -211,10 +211,10 @@ scenario_panel::render() {
| ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 );
if( size.x > 0 ) { if( size.x > 0 ) {
ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); ImGui::SetNextWindowSize( ImVec2S( size.x, size.y ) );
} }
if( size_min.x > 0 ) { if( size_min.x > 0 ) {
ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2S( size_max.x, size_max.y ) );
} }
auto const panelname { ( auto const panelname { (
title.empty() ? title.empty() ?
@@ -437,10 +437,10 @@ timetable_panel::render() {
| ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 );
if( size.x > 0 ) { if( size.x > 0 ) {
ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); ImGui::SetNextWindowSize( ImVec2S( size.x, size.y ) );
} }
if( size_min.x > 0 ) { if( size_min.x > 0 ) {
ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2S( size_max.x, size_max.y ) );
} }
auto const panelname { ( auto const panelname { (
title.empty() ? title.empty() ?
@@ -528,10 +528,10 @@ debug_panel::render() {
| ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 );
if( size.x > 0 ) { if( size.x > 0 ) {
ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); ImGui::SetNextWindowSize( ImVec2S( size.x, size.y ) );
} }
if( size_min.x > 0 ) { if( size_min.x > 0 ) {
ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2S( size_max.x, size_max.y ) );
} }
auto const panelname { ( auto const panelname { (
title.empty() ? title.empty() ?
@@ -1342,10 +1342,10 @@ transcripts_panel::render() {
| ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 );
if( size.x > 0 ) { if( size.x > 0 ) {
ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); ImGui::SetNextWindowSize( ImVec2S( size.x, size.y ) );
} }
if( size_min.x > 0 ) { if( size_min.x > 0 ) {
ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2S( size_max.x, size_max.y ) );
} }
auto const panelname { ( auto const panelname { (
title.empty() ? title.empty() ?

8
editoruipanels.cpp
View File

@@ -261,10 +261,10 @@ itemproperties_panel::render() {
| ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 );
if( size.x > 0 ) { if( size.x > 0 ) {
ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); ImGui::SetNextWindowSize( ImVec2S( size.x, size.y ) );
} }
if( size_min.x > 0 ) { if( size_min.x > 0 ) {
ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) );
} }
auto const panelname { ( auto const panelname { (
title.empty() ? title.empty() ?
@@ -357,10 +357,10 @@ nodebank_panel::render() {
| ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 );
if( size.x > 0 ) { if( size.x > 0 ) {
ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); ImGui::SetNextWindowSize( ImVec2S( size.x, size.y ) );
} }
if( size_min.x > 0 ) { if( size_min.x > 0 ) {
ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2S( size_max.x, size_max.y ) );
} }
auto const panelname { ( auto const panelname { (
title.empty() ? title.empty() ?

2
launcher/launcheruilayer.cpp
View File

@@ -29,7 +29,7 @@ void launcher_ui::render_()
ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse; ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse;
ImVec2 display_size = ImGui::GetIO().DisplaySize; ImVec2 display_size = ImGui::GetIO().DisplaySize;
ImGui::SetNextWindowPos(ImVec2(display_size.x * 0.66f, display_size.y / 2.0f)); ImGui::SetNextWindowPos(ImVec2(display_size.x * 0.66f, display_size.y / 2.0f));
ImGui::SetNextWindowSize(ImVec2(200, -1)); ImGui::SetNextWindowSize(ImVec2(200 * Global.ui_scale, -1));
if (ImGui::Begin(STR_C("Main menu"), nullptr, flags)) { if (ImGui::Begin(STR_C("Main menu"), nullptr, flags)) {
if (ImGui::Button(STR_C("Scenario list"), ImVec2(-1, 0))) if (ImGui::Button(STR_C("Scenario list"), ImVec2(-1, 0)))

2
opengl33renderer.cpp
View File

@@ -639,7 +639,7 @@ void opengl33_renderer::draw_debug_ui()
} }
ImGui::End(); ImGui::End();
ImGui::SetNextWindowSize(ImVec2(400, 400)); ImGui::SetNextWindowSize(ImVec2S(400, 400));
if (ImGui::Begin("Pickbuffer") && m_pick_tex) { if (ImGui::Begin("Pickbuffer") && m_pick_tex) {
ImGui::Image(reinterpret_cast<void *>(m_pick_tex->id), ImGui::GetContentRegionAvail(), ImVec2(0, 1.0), ImVec2(1.0, 0)); ImGui::Image(reinterpret_cast<void *>(m_pick_tex->id), ImGui::GetContentRegionAvail(), ImVec2(0, 1.0), ImVec2(1.0, 0));
} }

1
stdafx.h
View File

@@ -110,6 +110,7 @@ int const null_handle = 0;
#define glDebug(x) if (GLAD_GL_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x); #define glDebug(x) if (GLAD_GL_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x);
#include "imgui/imgui.h" #include "imgui/imgui.h"
#define ImVec2S(a, b) ImVec2(a * Global.ui_scale, b * Global.ui_scale)
#include "openglcolor.h" #include "openglcolor.h"
#endif #endif

4
uilayer.cpp
View File

@@ -45,12 +45,12 @@ void ui_panel::render()
((size.x > 0) ? ImGuiWindowFlags_NoResize : 0); ((size.x > 0) ? ImGuiWindowFlags_NoResize : 0);
if (size.x > 0) if (size.x > 0)
ImGui::SetNextWindowSize(ImVec2(size.x, size.y)); ImGui::SetNextWindowSize(ImVec2S(size.x, size.y));
else if (size_min.x == -1) else if (size_min.x == -1)
ImGui::SetNextWindowSize(ImVec2(0, 0), ImGuiCond_FirstUseEver); ImGui::SetNextWindowSize(ImVec2(0, 0), ImGuiCond_FirstUseEver);
if (size_min.x > 0) if (size_min.x > 0)
ImGui::SetNextWindowSizeConstraints(ImVec2(size_min.x, size_min.y), ImVec2(size_max.x, size_max.y)); ImGui::SetNextWindowSizeConstraints(ImVec2S(size_min.x, size_min.y), ImVec2S(size_max.x, size_max.y));
auto const panelname{(title.empty() ? m_name : title) + "###" + m_name}; auto const panelname{(title.empty() ? m_name : title) + "###" + m_name};
if (ImGui::Begin(panelname.c_str(), &is_open, flags)) { if (ImGui::Begin(panelname.c_str(), &is_open, flags)) {