mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-22 10:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13178 from jordan-woyak/input-expressions-conditional-op

Browse source 
InputCommon: Add ternary conditional operator to input expressions.
This commit is contained in:
JMC47 2025-01-27 21:16:29 -05:00 • committed by GitHub
commit e18a4d04b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 52 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
View file

@ -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"));