UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-25 16:50:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] InputTextDelegate and LayoutFieldDelegate don't inherit from

Browse Source 
InputTextDelegate to avoid diamond inheritance
This commit is contained in:
Émilie Feral
2018-10-22 18:14:30 +02:00
parent 0a438b1803
commit 698332c355
138 changed files with 285 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/shared/range_parameter_controller.cpp
View File

@@ -7,7 +7,7 @@ using namespace Poincare;
namespace Shared {
RangeParameterController::RangeParameterController(Responder * parentResponder, InteractiveCurveViewRange * interactiveRange) :
RangeParameterController::RangeParameterController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, InteractiveCurveViewRange * interactiveRange) :
FloatParameterController(parentResponder),
m_interactiveRange(interactiveRange),
m_xRangeCells{},
@@ -16,13 +16,13 @@ RangeParameterController::RangeParameterController(Responder * parentResponder,
{
for (int i = 0; i < k_numberOfEditableTextCell; i++) {
m_xRangeCells[i].setParentResponder(&m_selectableTableView);
m_xRangeCells[i].textField()->setDelegate(this);
m_xRangeCells[i].textField()->setDelegates(inputEventHandlerDelegate, this);
m_xRangeCells[i].textField()->setDraftTextBuffer(m_draftTextBuffer);
}
for (int i = 0; i < k_numberOfConvertibleTextCell; i++) {
m_yRangeCells[i].setParentResponder(&m_selectableTableView);
m_yRangeCells[i].setInteractiveCurveViewRange(m_interactiveRange);
m_yRangeCells[i].textField()->setDelegate(this);
m_yRangeCells[i].textField()->setDelegates(inputEventHandlerDelegate, this);
m_yRangeCells[i].textField()->setDraftTextBuffer(m_draftTextBuffer);
}
}