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

[poincare] Rename BracketRight/LeftLayout -> Right/LeftBracketLayout.

Browse Source 
Change-Id: I382ac960aeca861d1003cd2373709a6759ded685
This commit is contained in:
Léa Saviot
2018-04-19 16:13:32 +02:00
parent a2f2a64bbd
commit 72f6946b14
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
poincare/Makefile
View File

@@ -92,9 +92,9 @@ objs += $(addprefix poincare/src/layout/,\
binomial_coefficient_layout.o\
bounded_static_layout_hierarchy.o\
bracket_pair_layout.o\
bracket_left_layout.o\
left_bracket_layout.o\
bracket_left_right_layout.o\
bracket_right_layout.o\
right_bracket_layout.o\
ceiling_layout.o\
char_layout.o\
condensed_sum_layout.o\

4
poincare/include/poincare_layouts.h
View File

@@ -5,8 +5,8 @@
#include <poincare/src/layout/absolute_value_layout.h>
#include <poincare/src/layout/binomial_coefficient_layout.h>
#include <poincare/src/layout/bracket_pair_layout.h>
#include <poincare/src/layout/bracket_left_layout.h>
#include <poincare/src/layout/bracket_right_layout.h>
#include <poincare/src/layout/left_bracket_layout.h>
#include <poincare/src/layout/right_bracket_layout.h>
#include <poincare/src/layout/ceiling_layout.h>
#include <poincare/src/layout/char_layout.h>
#include <poincare/src/layout/condensed_sum_layout.h>

4
poincare/src/expression_layout_cursor.cpp
View File

@@ -183,9 +183,9 @@ void ExpressionLayoutCursor::insertText(const char * text) {
* binary file 2K. */
#if 0
else if (text[i] == '[') {
newChild = new BracketLeftLayout();
newChild = new LeftBracketLayout();
} else if (text[i] == ']') {
newChild = new BracketRightLayout();
newChild = new RightBracketLayout();
}
#endif
else {

12
poincare/src/layout/bracket_left_layout.cpp → poincare/src/layout/left_bracket_layout.cpp
View File

@@ -1,4 +1,4 @@
#include "bracket_left_layout.h"
#include "left_bracket_layout.h"
#include <escher/metric.h>
extern "C" {
#include <assert.h>
@@ -6,18 +6,18 @@ extern "C" {
namespace Poincare {
ExpressionLayout * BracketLeftLayout::clone() const {
BracketLeftLayout * layout = new BracketLeftLayout();
ExpressionLayout * LeftBracketLayout::clone() const {
LeftBracketLayout * layout = new LeftBracketLayout();
return layout;
}
void BracketLeftLayout::render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) {
void LeftBracketLayout::render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) {
ctx->fillRect(KDRect(p.x()+k_externWidthMargin, p.y(), k_lineThickness, operandHeight()), expressionColor);
ctx->fillRect(KDRect(p.x()+k_externWidthMargin, p.y(), k_bracketWidth, k_lineThickness), expressionColor);
ctx->fillRect(KDRect(p.x()+k_externWidthMargin, p.y() + operandHeight(), k_bracketWidth, k_lineThickness), expressionColor);
}
void BracketLeftLayout::computeOperandHeight() {
void LeftBracketLayout::computeOperandHeight() {
assert(m_parent != nullptr);
m_operandHeight = Metric::MinimalBracketAndParenthesisHeight;
int currentNumberOfOpenBrackets = 1;
@@ -39,7 +39,7 @@ void BracketLeftLayout::computeOperandHeight() {
}
}
void BracketLeftLayout::computeBaseline() {
void LeftBracketLayout::computeBaseline() {
assert(m_parent != nullptr);
m_baseline = operandHeight()/2;
int currentNumberOfOpenBrackets = 1;

2
poincare/src/layout/bracket_left_layout.h → poincare/src/layout/left_bracket_layout.h
View File

@@ -6,7 +6,7 @@
namespace Poincare {
class BracketLeftLayout : public BracketLeftRightLayout {
class LeftBracketLayout : public BracketLeftRightLayout {
public:
using BracketLeftRightLayout::BracketLeftRightLayout;
ExpressionLayout * clone() const override;

12
poincare/src/layout/bracket_right_layout.cpp → poincare/src/layout/right_bracket_layout.cpp
View File

@@ -1,4 +1,4 @@
#include "bracket_right_layout.h"
#include "right_bracket_layout.h"
#include <escher/metric.h>
extern "C" {
#include <assert.h>
@@ -6,18 +6,18 @@ extern "C" {
namespace Poincare {
ExpressionLayout * BracketRightLayout::clone() const {
BracketRightLayout * layout = new BracketRightLayout();
ExpressionLayout * RightBracketLayout::clone() const {
RightBracketLayout * layout = new RightBracketLayout();
return layout;
}
void BracketRightLayout::render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) {
void RightBracketLayout::render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) {
ctx->fillRect(KDRect(p.x()+k_widthMargin, p.y(), k_lineThickness, operandHeight()), expressionColor);
ctx->fillRect(KDRect(p.x()+k_widthMargin-k_bracketWidth+1, p.y(), k_bracketWidth, k_lineThickness), expressionColor);
ctx->fillRect(KDRect(p.x()+k_widthMargin-k_bracketWidth+1, p.y() + operandHeight(), k_bracketWidth, k_lineThickness), expressionColor);
}
void BracketRightLayout::computeOperandHeight() {
void RightBracketLayout::computeOperandHeight() {
assert(m_parent != nullptr);
m_operandHeight = Metric::MinimalBracketAndParenthesisHeight;
int currentNumberOfOpenBrackets = 1;
@@ -38,7 +38,7 @@ void BracketRightLayout::computeOperandHeight() {
}
}
void BracketRightLayout::computeBaseline() {
void RightBracketLayout::computeBaseline() {
assert(m_parent != nullptr);
m_baseline = operandHeight()/2;
int currentNumberOfOpenBrackets = 1;

2
poincare/src/layout/bracket_right_layout.h → poincare/src/layout/right_bracket_layout.h
View File

@@ -6,7 +6,7 @@
namespace Poincare {
class BracketRightLayout : public BracketLeftRightLayout {
class RightBracketLayout : public BracketLeftRightLayout {
public:
using BracketLeftRightLayout::BracketLeftRightLayout;
ExpressionLayout * clone() const override;