From 263b38749e16b251eca5f37a78bded96ac55955e Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Mon, 27 Jun 2011 20:46:33 +1000
Subject: [PATCH] Mouse control problem

---
 Graphs/graphwindow.cpp | 24 +++---------------------
 mainwindow.cpp         |  3 +++
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp
index a6dea75d..5b4030c3 100644
--- a/Graphs/graphwindow.cpp
+++ b/Graphs/graphwindow.cpp
@@ -47,25 +47,6 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLContext *
     ti=QDateTime::currentDateTime();
     gtitle=foobar=xaxis=yaxis=NULL;
 
-
- /*   if (!shared_context) {
-
-        int q=0;
-#if defined(__DARWIN__) && !wxCHECK_VERSION(2,9,0)
-        // Screw you apple..
-        int *attribList = (int*) NULL;
-        AGLPixelFormat aglpf=aglChoosePixelFormat(NULL,0,attribList);
-        shared_context=new wxGLContext(aglpf,this,wxNullPalette,NULL);
-
-        // Mmmmm.. Platform incosistency with wx..
-
-#else   // (Darwin joins the rest of the platforms as of wx2.9)
-        shared_context=new wxGLContext(this,NULL);
-#endif
-
-    }
-*/
-    //texfont=::texfont;
     if (!title.isEmpty()) {
         AddLayer(new gTitle(title));
     }
@@ -335,10 +316,11 @@ void gGraphWindow::mouseMoveEvent(QMouseEvent * event)
         int x2=x;
         int t1=MIN(x1,x2);
         int t2=MAX(x1,x2);
-        if (t1<=m_marginLeft) t1=m_marginLeft+1;
+        if (t1<m_marginLeft) t1=m_marginLeft;
+        if (t2<m_marginLeft) t2=m_marginLeft;
         if (t2>(m_scrX-m_marginRight)) t2=m_scrX-m_marginRight;
 
-        QRect r(t1, m_marginBottom, t2-t1, m_scrY-m_marginBottom-m_marginTop);
+        QRect r(t1-1, m_marginBottom, t2-t1, m_scrY-m_marginBottom-m_marginTop);
 
         m_mouseRBlast=m_mouseRBrect;
         m_mouseRBrect=r;
diff --git a/mainwindow.cpp b/mainwindow.cpp
index c87f6035..beb3a740 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -9,6 +9,7 @@
 #include <QMessageBox>
 #include <QResource>
 #include <QProgressBar>
+#include <QWebHistory>
 #include <QTimer>
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
@@ -198,6 +199,8 @@ void MainWindow::on_webView_loadFinished(bool arg1)
     } else {
         qstatus->setText("Ready");
     }
+    ui->backButton->setEnabled(ui->webView->history()->canGoBack());
+    ui->forwardButton->setEnabled(ui->webView->history()->canGoForward());
 
 }