mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-29 08:15:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'menu_fix' into 'master'

Browse source 
Update canvas size every frame when it is visible

See merge request OpenMW/openmw!3463
This commit is contained in:
psi29a 2023-09-29 11:25:09 +00:00
commit 08ff69f199
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -73,6 +73,7 @@
Bug #7553: Faction reaction loading is incorrect Bug #7553: Faction reaction loading is incorrect
Bug #7557: Terrain::ChunkManager::createChunk is called twice for the same position, lod on initial loading Bug #7557: Terrain::ChunkManager::createChunk is called twice for the same position, lod on initial loading
Bug #7573: Drain Fatigue can't bring fatigue below zero by default Bug #7573: Drain Fatigue can't bring fatigue below zero by default
Bug #7603: Scripts menu size is not updated properly
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples
Feature #5492: Let rain and snow collide with statics Feature #5492: Let rain and snow collide with statics
Feature #6149: Dehardcode Lua API_REVISION Feature #6149: Dehardcode Lua API_REVISION

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

@ -230,6 +230,16 @@ namespace MWGui
} }
} }
void SettingsWindow::onFrame(float duration)
{
if (mScriptView->getVisible())
{
const auto scriptsSize = mScriptAdapter->getSize();
if (mScriptView->getCanvasSize() != scriptsSize)
mScriptView->setCanvasSize(scriptsSize);
}
}
void SettingsWindow::updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value) void SettingsWindow::updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value)
{ {
std::string labelWidgetName = scroller->getUserString("SettingLabelWidget"); std::string labelWidgetName = scroller->getUserString("SettingLabelWidget");
@ -1005,7 +1015,6 @@ namespace MWGui
mScriptDisabled->setVisible(disabled); mScriptDisabled->setVisible(disabled);
LuaUi::attachPageAt(mCurrentPage, mScriptAdapter); LuaUi::attachPageAt(mCurrentPage, mScriptAdapter);
mScriptView->setCanvasSize(mScriptAdapter->getSize());
} }
void SettingsWindow::onScriptFilterChange(MyGUI::EditBox*) void SettingsWindow::onScriptFilterChange(MyGUI::EditBox*)
@ -1022,7 +1031,6 @@ namespace MWGui
mCurrentPage = *mScriptList->getItemDataAt<size_t>(index); mCurrentPage = *mScriptList->getItemDataAt<size_t>(index);
LuaUi::attachPageAt(mCurrentPage, mScriptAdapter); LuaUi::attachPageAt(mCurrentPage, mScriptAdapter);
} }
mScriptView->setCanvasSize(mScriptAdapter->getSize());
} }
void SettingsWindow::onRebindAction(MyGUI::Widget* _sender) void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)

2
apps/openmw/mwgui/settingswindow.hpp
View file

@ -14,6 +14,8 @@ namespace MWGui
void onOpen() override; void onOpen() override;
void onFrame(float duration) override;
void updateControlsBox(); void updateControlsBox();
void updateLightSettings(); void updateLightSettings();