UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-28 01:59:59 +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

4
escher/src/input_event_handler.cpp
View File

@@ -5,8 +5,8 @@
#include <escher/metric.h>
bool InputEventHandler::handleToolboxEvent(App * app) {
if (inputEventHandlerDelegate() != nullptr) {
Toolbox * toolbox = inputEventHandlerDelegate()->toolboxForInputEventHandler(this);
if (m_inputEventHandlerDelegate != nullptr) {
Toolbox * toolbox = m_inputEventHandlerDelegate->toolboxForInputEventHandler(this);
toolbox->setSender(this);
app->displayModalViewController(toolbox, 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
return true;