mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-03-30 04:00:02 +02:00
[escher] InputTextDelegate and LayoutFieldDelegate don't inherit from
InputTextDelegate to avoid diamond inheritance
This commit is contained in:
@@ -67,7 +67,7 @@ void ParametersController::ContentView::layoutSubviews() {
|
||||
|
||||
/* Parameters Controller */
|
||||
|
||||
ParametersController::ParametersController(Responder * parentResponder, Law * law, CalculationController * calculationController) :
|
||||
ParametersController::ParametersController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, Law * law, CalculationController * calculationController) :
|
||||
FloatParameterController(parentResponder),
|
||||
m_contentView(this, &m_selectableTableView),
|
||||
m_menuListCell{},
|
||||
@@ -78,7 +78,7 @@ ParametersController::ParametersController(Responder * parentResponder, Law * la
|
||||
m_okButton.setMessage(I18n::Message::Next);
|
||||
for (int i = 0; i < k_maxNumberOfCells; i++) {
|
||||
m_menuListCell[i].setParentResponder(&m_selectableTableView);
|
||||
m_menuListCell[i].textField()->setDelegate(this);
|
||||
m_menuListCell[i].textField()->setDelegates(inputEventHandlerDelegate, this);
|
||||
m_menuListCell[i].textField()->setDraftTextBuffer(m_draftTextBuffer);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user