daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong positioning of subobjects within objects

Browse Source
This commit is contained in:
G.K.MacGregor
2021-04-18 19:33:32 +01:00
parent dc93fe856d
commit 690f340922
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
render.cpp
View File

@@ -187,7 +187,7 @@ void TeletextPageRender::buildEnhanceMap(TextLayer *enhanceLayer, int tripletNum
EnhanceLayer *newLayer = new EnhanceLayer;
m_textLayer.push_back(newLayer);
newLayer->setObjectType(x26Triplet->mode() & 0x03);
newLayer->setOrigin(activePosition.row()+originModifierR, activePosition.column()+originModifierC);
newLayer->setOrigin(enhanceLayer->originR() + activePosition.row() + originModifierR, enhanceLayer->originC() + activePosition.column() + originModifierC);
buildEnhanceMap(newLayer, tripletPointer+1);
} else
qDebug("POP or GPOP");

4
render.h
View File

@@ -107,6 +107,8 @@ public:
virtual int fullRowColour(int) const =0;
virtual bool fullRowDownwards(int) const =0;
virtual int objectType() const =0;
virtual int originR() const { return 0; };
virtual int originC() const { return 0; };
void setFullScreenColour(int);
void setFullRowColour(int, int, bool);
@@ -131,6 +133,8 @@ public:
int fullRowColour(int r) const { return m_layerFullRowColour[r]; };
bool fullRowDownwards(int r) const { return m_layerFullRowDownwards[r]; };
int objectType() const { return m_objectType; };
int originR() const { return m_originR; };
int originC() const { return m_originC; };
void setObjectType(int);
void setOrigin(int, int);