The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-14 00:58:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

InputConfigDialog: Don't show "..." for complicated expressions

Browse Source 
Just show the actual expression. We need to do a bit of mangling
here as wx has no way to turn off mnemonics parsing, so do that
as well.
This commit is contained in:
Jasper St. Pierre
2013-06-29 18:27:11 -04:00
parent eb153cfded
commit d5983b587e
4 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
View File

@ -210,7 +210,6 @@ public:
virtual ControlState GetValue() { return 0; }
virtual void SetValue(ControlState state) {}
virtual int CountNumControls() { return 0; }
virtual bool IsComplicated() { return false; }
virtual operator std::string() { return ""; }
};
@ -237,11 +236,6 @@ public:
return 1;
}
virtual bool IsComplicated()
{
return false;
}
virtual operator std::string()
{
return "`" + (std::string)qualifier + "`";
@ -293,11 +287,6 @@ public:
return lhs->CountNumControls() + rhs->CountNumControls();
}
virtual bool IsComplicated()
{
return true;
}
virtual operator std::string()
{
return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
@ -345,11 +334,6 @@ public:
return inner->CountNumControls();
}
virtual bool IsComplicated()
{
return true;
}
virtual operator std::string()
{
return OpName(op) + "(" + (std::string)(*inner) + ")";
@ -539,7 +523,6 @@ Expression::Expression(ExpressionNode *node_)
{
node = node_;
num_controls = node->CountNumControls();
is_complicated = node->IsComplicated();
}
Expression::~Expression()