From 760f32c5c2c0ba11d2aec92ffa09e28182fb51d6 Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Thu, 19 Nov 2020 23:18:28 +0100
Subject: [PATCH] changed y-position displayed in tooltip to scanline number

---
 src/debugger/gui/TiaOutputWidget.cxx | 7 ++++---
 src/debugger/gui/TiaZoomWidget.cxx   | 8 +++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/debugger/gui/TiaOutputWidget.cxx b/src/debugger/gui/TiaOutputWidget.cxx
index 6d2a1b9cb..424efd0d1 100644
--- a/src/debugger/gui/TiaOutputWidget.cxx
+++ b/src/debugger/gui/TiaOutputWidget.cxx
@@ -104,14 +104,14 @@ void TiaOutputWidget::saveSnapshot(int execDepth, const string& execPrefix)
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void TiaOutputWidget::handleMouseDown(int x, int y, MouseButton b, int clickCount)
-{
+{  
   if(b == MouseButton::LEFT)
     myZoom->setPos(x, y);
   // Grab right mouse button for command context menu
   else if(b == MouseButton::RIGHT)
   {
     myClickX = x;
-    myClickY = y;
+    myClickY = y - 1;
 
     dialog().tooltip().hide();
     // Add menu at current x,y mouse location
@@ -184,6 +184,7 @@ string TiaOutputWidget::getToolTip(const Common::Point& pos) const
   if(idx.x < 0)
     return EmptyString;
 
+  const uInt32 startLine = instance().console().tia().startLine();
   const uInt32 height = instance().console().tia().height();
   // limit to 274 lines (PAL default without scaling)
   const uInt32 yStart = height <= FrameManager::Metrics::baseHeightPAL
@@ -194,7 +195,7 @@ string TiaOutputWidget::getToolTip(const Common::Point& pos) const
 
   buf << _toolTipText
     << "X: #" << idx.x
-    << "\nY: #" << idx.y
+    << "\nY: #" << idx.y + startLine
     << "\nC: $" << Common::Base::toString(tiaOutputBuffer[i], Common::Base::Fmt::_16);
 
   return buf.str();
diff --git a/src/debugger/gui/TiaZoomWidget.cxx b/src/debugger/gui/TiaZoomWidget.cxx
index 3cbbad8e2..3622c11ac 100644
--- a/src/debugger/gui/TiaZoomWidget.cxx
+++ b/src/debugger/gui/TiaZoomWidget.cxx
@@ -117,7 +117,7 @@ void TiaZoomWidget::recalc()
 void TiaZoomWidget::handleMouseDown(int x, int y, MouseButton b, int clickCount)
 {
   myClickX = x;
-  myClickY = y;
+  myClickY = y - 1;
 
   // Button 1 is for 'drag'/movement of the image
   // Button 2 is for context menu
@@ -148,7 +148,7 @@ void TiaZoomWidget::handleMouseWheel(int x, int y, int direction)
 
   // zoom towards mouse position
   myClickX = x;
-  myClickY = y;
+  myClickY = y - 1;
 
   if(direction > 0)
   {
@@ -167,6 +167,7 @@ void TiaZoomWidget::handleMouseMoved(int x, int y)
 {
   if(myMouseMoving)
   {
+    y--;
     int diffx = x + myOffXLo - myClickX;
     int diffy = y + myOffYLo - myClickY;
 
@@ -302,12 +303,13 @@ string TiaZoomWidget::getToolTip(const Common::Point& pos) const
     return EmptyString;
 
   const Int32 i = idx.x + idx.y * instance().console().tia().width();
+  const uInt32 startLine = instance().console().tia().startLine();
   uInt8* tiaOutputBuffer = instance().console().tia().outputBuffer();
   ostringstream buf;
 
   buf << _toolTipText
     << "X: #" << idx.x
-    << "\nY: #" << idx.y
+    << "\nY: #" << idx.y + startLine
     << "\nC: $" << Common::Base::toString(tiaOutputBuffer[i], Common::Base::Fmt::_16);
 
   return buf.str();