From 8bc0c2c88636e5090f4164e00abbddcbd29d0c48 Mon Sep 17 00:00:00 2001
From: "G.K.MacGregor" <gkthemac@gmail.com>
Date: Mon, 26 Apr 2021 21:06:00 +0100
Subject: [PATCH] Move cursor from widget to scene

---
 mainwidget.cpp | 22 ++++++++++++++--------
 mainwidget.h   |  2 ++
 mainwindow.cpp |  1 +
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/mainwidget.cpp b/mainwidget.cpp
index d36b760..c37552c 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -109,8 +109,6 @@ void TeletextWidget::paintEvent(QPaintEvent *event)
 		widgetPainter.drawPixmap(0, 0, *m_pageRender.pagePixmap(m_flashPhase), 864-m_pageRender.leftSidePanelColumns()*12, 0, m_pageRender.leftSidePanelColumns()*12, 250);
 	if (m_pageRender.rightSidePanelColumns())
 		widgetPainter.drawPixmap(480+m_pageRender.leftSidePanelColumns()*12, 0, *m_pageRender.pagePixmap(m_flashPhase), 480, 0, m_pageRender.rightSidePanelColumns()*12, 250);
-	if (this->hasFocus())
-		widgetPainter.fillRect((m_teletextDocument->cursorColumn()+m_pageRender.leftSidePanelColumns())*12, m_teletextDocument->cursorRow()*10, 12, 10, QColor(128, 128, 128, 192));
 	if (m_teletextDocument->selectionActive()) {
 		widgetPainter.setPen(QPen(QColor(192, 192, 192, 224), 1, Qt::DashLine));
 		widgetPainter.setBrush(QBrush(QColor(255, 255, 255, 64)));
@@ -347,19 +345,15 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 
 		case Qt::Key_Up:
 			m_teletextDocument->cursorUp();
-			update();
 			break;
 		case Qt::Key_Down:
 			m_teletextDocument->cursorDown();
-			update();
 			break;
 		case Qt::Key_Left:
 			m_teletextDocument->cursorLeft();
-			update();
 			break;
 		case Qt::Key_Right:
 			m_teletextDocument->cursorRight();
-			update();
 			break;
 		case Qt::Key_Return:
 		case Qt::Key_Enter:
@@ -367,11 +361,9 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 			// fall through
 		case Qt::Key_Home:
 			m_teletextDocument->moveCursor(m_teletextDocument->cursorRow(), 0);
-			update();
 			break;
 		case Qt::Key_End:
 			m_teletextDocument->moveCursor(m_teletextDocument->cursorRow(), 39);
-			update();
 			break;
 
 		case Qt::Key_PageUp:
@@ -504,6 +496,12 @@ LevelOneScene::LevelOneScene(QWidget *levelOneWidget, QObject *parent) : QGraphi
 	m_levelOneProxyWidget->setPos(60, 19);
 	m_levelOneProxyWidget->setAutoFillBackground(false);
 
+	// Cursor
+	m_cursorRectItem = new QGraphicsRectItem(0, 0, 12, 10);
+	m_cursorRectItem->setPen(Qt::NoPen);
+	m_cursorRectItem->setBrush(QBrush(QColor(128, 128, 128, 192)));
+	addItem(m_cursorRectItem);
+
 	// Optional grid overlay for text widget
 	m_mainGridItemGroup = new QGraphicsItemGroup;
 	m_mainGridItemGroup->setVisible(false);
@@ -545,6 +543,9 @@ void LevelOneScene::setBorderDimensions(int sceneWidth, int sceneHeight, int wid
 
 	// Position grid to cover central 40 columns
 	m_mainGridItemGroup->setPos(leftRightBorders + leftSidePanelColumns*12, topBottomBorders);
+
+	updateCursor();
+
 	// Grid for right side panel
 	for (int c=0; c<16; c++)
 		if (rightSidePanelColumns > c) {
@@ -576,6 +577,11 @@ void LevelOneScene::setBorderDimensions(int sceneWidth, int sceneHeight, int wid
 	}
 }
 
+void LevelOneScene::updateCursor()
+{
+	m_cursorRectItem->setPos(m_mainGridItemGroup->pos().x() + static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->document()->cursorColumn()*12, m_mainGridItemGroup->pos().y() + static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->document()->cursorRow()*10);
+}
+
 void LevelOneScene::toggleGrid(bool gridOn)
 {
 	m_grid = gridOn;
diff --git a/mainwidget.h b/mainwidget.h
index 32bcf4c..09a8567 100644
--- a/mainwidget.h
+++ b/mainwidget.h
@@ -109,6 +109,7 @@ public:
 	void setBorderDimensions(int, int, int, int, int);
 
 public slots:
+	void updateCursor();
 	void toggleGrid(bool);
 	void setFullScreenColour(const QColor &);
 	void setFullRowColour(int, const QColor &);
@@ -117,6 +118,7 @@ private:
 	QGraphicsRectItem *m_fullScreenTopRectItem, *m_fullScreenBottomRectItem;
 	QGraphicsRectItem *m_fullRowLeftRectItem[25], *m_fullRowRightRectItem[25];
 	QGraphicsProxyWidget *m_levelOneProxyWidget;
+	QGraphicsRectItem *m_cursorRectItem;
 	QGraphicsItemGroup *m_mainGridItemGroup, *m_sidePanelGridItemGroup[32];
 	bool m_grid, m_sidePanelGridNeeded[32];
 };
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 64363ff..ec80bab 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -926,6 +926,7 @@ MainWindow *MainWindow::findMainWindow(const QString &fileName) const
 void MainWindow::updateCursorPosition()
 {
 	m_cursorPositionLabel->setText(QString("Row %1 Column %2").arg(m_textWidget->document()->cursorRow()).arg(m_textWidget->document()->cursorColumn()));
+	m_textScene->updateCursor();
 }
 
 void MainWindow::updatePageWidgets()