mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 06:53:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2360 from akortunov/guifixes

Browse source 
Do not track resolution settings changes in the InputManager
This commit is contained in:
Alexei Dobrohotov 2019-05-04 20:23:03 +03:00 committed by GitHub
commit 1bfe0e43af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -58,6 +58,7 @@
Bug #4877: Startup script executes only on a new game start Bug #4877: Startup script executes only on a new game start
Bug #4888: Global variable stray explicit reference calls break script compilation Bug #4888: Global variable stray explicit reference calls break script compilation
Bug #4896: Title screen music doesn't loop Bug #4896: Title screen music doesn't loop
Bug #4902: Using scrollbars in settings causes resolution to change
Bug #4911: Editor: QOpenGLContext::swapBuffers() warning with Qt5 Bug #4911: Editor: QOpenGLContext::swapBuffers() warning with Qt5
Bug #4916: Specular power (shininess) material parameter is ignored when shaders are used. Bug #4916: Specular power (shininess) material parameter is ignored when shaders are used.
Bug #4918: Abilities don't play looping VFX when they're initially applied Bug #4918: Abilities don't play looping VFX when they're initially applied

1
apps/openmw/mwgui/settingswindow.cpp
View file

@ -611,6 +611,7 @@ namespace MWGui
void SettingsWindow::onOpen() void SettingsWindow::onOpen()
{ {
highlightCurrentResolution();
updateControlsBox(); updateControlsBox();
resetScrollbars(); resetScrollbars();
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mOkButton); MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mOkButton);

10
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -826,9 +826,6 @@ namespace MWInput
Settings::Manager::getInt("resolution y", "Video"), Settings::Manager::getInt("resolution y", "Video"),
Settings::Manager::getBool("fullscreen", "Video"), Settings::Manager::getBool("fullscreen", "Video"),
Settings::Manager::getBool("window border", "Video")); Settings::Manager::getBool("window border", "Video"));
// We should reload TrueType fonts to fit new resolution
MWBase::Environment::get().getWindowManager()->loadUserFonts();
} }
} }
@ -1129,10 +1126,17 @@ namespace MWInput
void InputManager::windowResized(int x, int y) void InputManager::windowResized(int x, int y)
{ {
// Note: this is a side effect of resolution change or window resize.
// There is no need to track these changes.
Settings::Manager::setInt("resolution x", "Video", x); Settings::Manager::setInt("resolution x", "Video", x);
Settings::Manager::setInt("resolution y", "Video", y); Settings::Manager::setInt("resolution y", "Video", y);
Settings::Manager::apply("resolution x", "Video");
Settings::Manager::apply("resolution y", "Video");
MWBase::Environment::get().getWindowManager()->windowResized(x, y); MWBase::Environment::get().getWindowManager()->windowResized(x, y);
// We should reload TrueType fonts to fit new resolution
MWBase::Environment::get().getWindowManager()->loadUserFonts();
} }
void InputManager::windowClosed() void InputManager::windowClosed()

6
components/settings/settings.cpp
View file

@ -414,6 +414,12 @@ void Manager::setBool(const std::string &setting, const std::string &category, c
setString(setting, category, value ? "true" : "false"); setString(setting, category, value ? "true" : "false");
} }
void Manager::apply(const std::string &setting, const std::string &category)
{
CategorySettingValueMap::key_type key = std::make_pair(category, setting);
mChangedSettings.erase(key);
}
const CategorySettingVector Manager::apply() const CategorySettingVector Manager::apply()
{ {
CategorySettingVector vec = mChangedSettings; CategorySettingVector vec = mChangedSettings;

2
components/settings/settings.hpp
View file

@ -35,6 +35,8 @@ namespace Settings
void saveUser (const std::string& file); void saveUser (const std::string& file);
///< save user settings to file ///< save user settings to file
static void apply(const std::string &setting, const std::string &category);
static const CategorySettingVector apply(); static const CategorySettingVector apply();
///< returns the list of changed settings and then clears it ///< returns the list of changed settings and then clears it