mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-07 03:49:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove clang warning

Browse Source 
Make the opening speed DPI scaling-dependent
This commit is contained in:
Alexander Bock
2017-05-18 14:59:17 -04:00
parent ba19348b58
commit e7a48f150a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interaction/luaconsole.cpp
+3 -2
View File
@@ -575,8 +575,9 @@ void LuaConsole::update() {
// The current height is the offset that is used to slide
// the console in from the top.
const glm::ivec2 res = OsEng.windowWrapper().currentWindowResolution();
const glm::vec2 dpiScaling = OsEng.windowWrapper().dpiScaling();
_currentHeight += (_targetHeight - _currentHeight) *
std::pow(0.98, 1.0 / (ConsoleOpenSpeed * frametime));
std::pow(0.98, 1.0 / (ConsoleOpenSpeed / dpiScaling.y * frametime));
_currentHeight = std::max(0.0f, _currentHeight);
_currentHeight = std::min(static_cast<float>(res.y), _currentHeight);
@@ -669,7 +670,7 @@ void LuaConsole::render() {
// @CPP17: Replace with array_view
std::vector<std::string> commandSubset;
if (_commandsHistory.size() < _historyLength) {
if (_commandsHistory.size() < static_cast<size_t>(_historyLength)) {
commandSubset = _commandsHistory;
}
else {