mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 13:18:50 +00:00
Merge pull request #13178 from jordan-woyak/input-expressions-conditional-op
InputCommon: Add ternary conditional operator to input expressions.
This commit is contained in:
commit
e18a4d04b4
3 changed files with 52 additions and 13 deletions
|
@ -161,6 +161,8 @@ void ControlExpressionSyntaxHighlighter::highlightBlock(const QString&)
|
|||
case TokenType::TOK_LPAREN:
|
||||
case TokenType::TOK_RPAREN:
|
||||
case TokenType::TOK_COMMA:
|
||||
case TokenType::TOK_QUESTION:
|
||||
case TokenType::TOK_COLON:
|
||||
char_format = GetSpecialCharFormat();
|
||||
break;
|
||||
case TokenType::TOK_LITERAL:
|
||||
|
@ -304,6 +306,7 @@ void IOWindow::CreateMainLayout()
|
|||
m_operators_combo->addItem(tr("< Less-than"));
|
||||
m_operators_combo->addItem(tr("& And"));
|
||||
m_operators_combo->addItem(tr("^ Xor"));
|
||||
m_operators_combo->addItem(tr("? Conditional"));
|
||||
}
|
||||
m_operators_combo->addItem(tr("| Or"));
|
||||
m_operators_combo->addItem(tr("$ User Variable"));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue