mirror of
https://github.com/OpenMW/openmw.git
synced 2025-03-01 17:39:41 +00:00
Merge branch 'postprocesshud48' into 'openmw-48'
Improve post-process HUD search field usability (0.48.0) See merge request OpenMW/openmw!2718
This commit is contained in:
commit
e0a25e02f0
1 changed files with 14 additions and 2 deletions
|
@ -9,6 +9,8 @@
|
||||||
#include <components/fx/widgets.hpp>
|
#include <components/fx/widgets.hpp>
|
||||||
#include <components/fx/technique.hpp>
|
#include <components/fx/technique.hpp>
|
||||||
|
|
||||||
|
#include <components/misc/utf8stream.hpp>
|
||||||
|
|
||||||
#include <components/widgets/box.hpp>
|
#include <components/widgets/box.hpp>
|
||||||
|
|
||||||
#include "../mwrender/postprocessor.hpp"
|
#include "../mwrender/postprocessor.hpp"
|
||||||
|
@ -396,9 +398,15 @@ namespace MWGui
|
||||||
if (!technique)
|
if (!technique)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!technique->getHidden() && !processor->isTechniqueEnabled(technique) && name.find(mFilter->getCaption()) != std::string::npos)
|
if (!technique->getHidden() && !processor->isTechniqueEnabled(technique))
|
||||||
|
{
|
||||||
|
std::string lowerName = Utf8Stream::lowerCaseUtf8(name);
|
||||||
|
std::string lowerCaption = mFilter->getCaption();
|
||||||
|
lowerCaption = Utf8Stream::lowerCaseUtf8(lowerCaption);
|
||||||
|
if (lowerName.find(lowerCaption) != std::string::npos)
|
||||||
mInactiveList->addItem(name, technique);
|
mInactiveList->addItem(name, technique);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (auto technique : processor->getTechniques())
|
for (auto technique : processor->getTechniques())
|
||||||
{
|
{
|
||||||
|
@ -408,6 +416,10 @@ namespace MWGui
|
||||||
|
|
||||||
auto tryFocus = [this](ListWrapper* widget, const std::string& hint)
|
auto tryFocus = [this](ListWrapper* widget, const std::string& hint)
|
||||||
{
|
{
|
||||||
|
MyGUI::Widget* oldFocus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
|
||||||
|
if (oldFocus == mFilter)
|
||||||
|
return;
|
||||||
|
|
||||||
size_t index = widget->findItemIndexWith(hint);
|
size_t index = widget->findItemIndexWith(hint);
|
||||||
|
|
||||||
if (index != MyGUI::ITEM_NONE)
|
if (index != MyGUI::ITEM_NONE)
|
||||||
|
|
Loading…
Reference in a new issue