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

[calculation][escher] Move ScrollableExpressionView from apps/calculation/ to

Browse Source 
escher/
This commit is contained in:
Émilie Feral
2019-12-27 10:29:08 +01:00
committed by Léa Saviot
parent 70ce133b4c
commit 9301dd510a
6 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/calculation/Makefile
View File

@@ -25,7 +25,6 @@ app_calculation_src = $(addprefix apps/calculation/,\
expression_field.cpp \
history_view_cell.cpp \
history_controller.cpp \
scrollable_expression_view.cpp \
selectable_table_view.cpp \
)

1
apps/calculation/history_view_cell.h
View File

@@ -3,7 +3,6 @@
#include <escher.h>
#include "calculation.h"
#include "scrollable_expression_view.h"
#include "../shared/scrollable_exact_approximate_expressions_view.h"
namespace Calculation {

1
escher/Makefile
View File

@@ -55,6 +55,7 @@ escher_src += $(addprefix escher/src/,\
scroll_view.cpp \
scroll_view_data_source.cpp \
scroll_view_indicator.cpp \
scrollable_expression_view.cpp \
scrollable_view.cpp \
selectable_table_view.cpp \
selectable_table_view_delegate.cpp \

1
escher/include/escher.h
View File

@@ -59,6 +59,7 @@
#include <escher/scroll_view_data_source.h>
#include <escher/scroll_view_indicator.h>
#include <escher/scrollable_view.h>
#include <escher/scrollable_expression_view.h>
#include <escher/selectable_table_view.h>
#include <escher/selectable_table_view_data_source.h>
#include <escher/selectable_table_view_delegate.h>

12
apps/calculation/scrollable_expression_view.h → escher/include/escher/scrollable_expression_view.h
View File

@@ -1,9 +1,9 @@
#ifndef CALCULATION_SCROLLABLE_EXPRESSION_VIEW_H
#define CALCULATION_SCROLLABLE_EXPRESSION_VIEW_H
#ifndef ESCHER_SCROLLABLE_EXPRESSION_VIEW_H
#define ESCHER_SCROLLABLE_EXPRESSION_VIEW_H
#include <escher.h>
namespace Calculation {
#include <escher/scrollable_view.h>
#include <escher/scroll_view_data_source.h>
#include <escher/expression_view.h>
class ScrollableExpressionView : public ScrollableView, public ScrollViewDataSource {
public:
@@ -16,6 +16,4 @@ private:
ExpressionView m_expressionView;
};
}
#endif

11
apps/calculation/scrollable_expression_view.cpp → escher/src/scrollable_expression_view.cpp
View File

@@ -1,8 +1,7 @@
#include "scrollable_expression_view.h"
#include <escher/scrollable_expression_view.h>
#include <poincare/layout.h>
#include <escher/metric.h>
#include <assert.h>
using namespace Poincare;
namespace Calculation {
ScrollableExpressionView::ScrollableExpressionView(Responder * parentResponder) :
ScrollableView(parentResponder, &m_expressionView, this),
@@ -21,7 +20,7 @@ Poincare::Layout ScrollableExpressionView::layout() const {
return m_expressionView.layout();
}
void ScrollableExpressionView::setLayout(Layout layout) {
void ScrollableExpressionView::setLayout(Poincare::Layout layout) {
m_expressionView.setLayout(layout);
}
@@ -33,5 +32,3 @@ void ScrollableExpressionView::setBackgroundColor(KDColor backgroundColor) {
void ScrollableExpressionView::setExpressionBackgroundColor(KDColor backgroundColor) {
m_expressionView.setBackgroundColor(backgroundColor);
}
}