From ab864e27fe159dea9d29f843fbaacacae20d043a Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 5 Dec 2023 15:06:07 +0300 Subject: [PATCH] Mouse Sensitivity moved to controls menu --- src/frontend/menu.cpp | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index e4d0e118..ab7ee152 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -172,9 +172,27 @@ Panel* create_controls_panel(Engine* engine, PagesControl* menu) { Panel* panel = new Panel(vec2(400, 200), vec4(2.0f), 1.0f); panel->color(vec4(0.0f)); + /* Camera sensitivity setting track bar */{ + panel->add((new Label(L""))->textSupplier([=]() { + std::wstringstream ss; + ss << std::fixed << std::setprecision(1); + ss << engine->getSettings().camera.sensitivity; + return L"Mouse Sensitivity: "+ss.str(); + })); + + TrackBar* trackbar = new TrackBar(0.1, 10.0, 2.0, 0.1, 4); + trackbar->supplier([=]() { + return engine->getSettings().camera.sensitivity; + }); + trackbar->consumer([=](double value) { + engine->getSettings().camera.sensitivity = value; + }); + panel->add(trackbar); + } + Panel* scrollPanel = new Panel(vec2(400, 200), vec4(2.0f), 1.0f); scrollPanel->color(vec4(0.0f, 0.0f, 0.0f, 0.3f)); - scrollPanel->maxLength(500); + scrollPanel->maxLength(400); for (auto& entry : Events::bindings){ string bindname = entry.first; @@ -266,23 +284,6 @@ Panel* create_settings_panel(Engine* engine, PagesControl* menu) { }); panel->add(trackbar); } - /* Camera sensitivity setting track bar */{ - panel->add((new Label(L""))->textSupplier([=]() { - std::wstringstream ss; - ss << std::fixed << std::setprecision(1); - ss << engine->getSettings().camera.sensitivity; - return L"Sensitivity: "+ss.str(); - })); - - TrackBar* trackbar = new TrackBar(0.1, 10.0, 2.0, 0.1, 4); - trackbar->supplier([=]() { - return engine->getSettings().camera.sensitivity; - }); - trackbar->consumer([=](double value) { - engine->getSettings().camera.sensitivity = value; - }); - panel->add(trackbar); - } /* V-Sync checkbox */{ Panel* checkpanel = new Panel(vec2(400, 32), vec4(5.0f), 1.0f);