From 2f70aa767260097c198b582b3fde9558472233b5 Mon Sep 17 00:00:00 2001 From: Guillaume Jacquemin Date: Sun, 14 Apr 2024 10:25:23 +0200 Subject: [PATCH] Application: minor style changes. --- src/Application/Application.cpp | 6 +++--- src/Application/Application_FileWatcher.cpp | 7 ++----- src/Application/Application_Initialisation.cpp | 7 +++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp index 01764aa..33f67d0 100644 --- a/src/Application/Application.cpp +++ b/src/Application/Application.cpp @@ -130,7 +130,7 @@ Application::Application(const Arguments& arguments): } if(conf().skipDisclaimer()) { - _uiState = UiState::Initialising; + _uiState = UiState::Initialising; _initThread = std::thread{[this]{ initialiseManager(); }}; } @@ -174,7 +174,7 @@ void Application::viewportEvent(ViewportEvent& event) { GL::defaultFramebuffer.setViewport({{}, event.framebufferSize()}); - const Vector2 size = Vector2{windowSize()}/dpiScaling(); + const auto size = Vector2{windowSize()}/dpiScaling(); _imgui.relayout(size, windowSize(), framebufferSize()); } @@ -347,7 +347,7 @@ Application::drawDisclaimer() { ImGui::TableSetColumnIndex(1); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {24.0f, 12.0f}); if(ImGui::Button("I understand the risks")) { - _uiState = UiState::Initialising; + _uiState = UiState::Initialising; _initThread = std::thread{[this]{ initialiseManager(); }}; } ImGui::PopStyleVar(); diff --git a/src/Application/Application_FileWatcher.cpp b/src/Application/Application_FileWatcher.cpp index 5dfdf8d..d5cf9a4 100644 --- a/src/Application/Application_FileWatcher.cpp +++ b/src/Application/Application_FileWatcher.cpp @@ -29,11 +29,8 @@ namespace mbst { void -Application::handleFileAction(efsw::WatchID watch_id, - const std::string&, - const std::string& filename, - efsw::Action action, - std::string old_filename) +Application::handleFileAction(efsw::WatchID watch_id, const std::string&, const std::string& filename, + efsw::Action action, std::string old_filename) { SDL_Event event; SDL_zero(event); diff --git a/src/Application/Application_Initialisation.cpp b/src/Application/Application_Initialisation.cpp index 51acb98..0e525ae 100644 --- a/src/Application/Application_Initialisation.cpp +++ b/src/Application/Application_Initialisation.cpp @@ -58,8 +58,7 @@ Application::initialiseGui() { LOG_INFO("Initialising Dear ImGui."); auto ctx = ImGui::CreateContext(); - - ImGuiIO& io = ImGui::GetIO(); + auto& io = ImGui::GetIO(); const auto size = Vector2{windowSize()}/dpiScaling(); @@ -94,10 +93,10 @@ Application::initialiseGui() { io.IniFilename = nullptr; - ImGuiStyle& style = ImGui::GetStyle(); + auto& style = ImGui::GetStyle(); style.WindowTitleAlign = {0.5f, 0.5f}; - style.FrameRounding = 3.2f; + style.FrameRounding = 3.2f; style.Colors[ImGuiCol_WindowBg] = ImColor(0xff1f1f1f); }