summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainwindow.cpp2
-rw-r--r--src/tabbar.cpp13
-rw-r--r--src/webview.cpp10
3 files changed, 9 insertions, 16 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 599295f7..963d405e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -388,7 +388,7 @@ void MainWindow::setupActions()
a->setShortcut(reloadShortcut);
a = new KAction(KIcon("process-stop"), i18n("&Stop"), this);
- a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_Period));
+ a->setShortcut(KShortcut(Qt::Key_Escape));
actionCollection()->addAction(QL1S("stop"), a);
connect(a, SIGNAL(triggered(bool)), m_view, SLOT(webStop()));
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 57124979..fcc7b789 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -222,18 +222,7 @@ void TabBar::mouseMoveEvent(QMouseEvent *event)
if (ReKonfig::hoveringTabOption() == 0)
{
//Find the tab under the mouse
- int i = 0;
- int tabIndex = -1;
- while (i < count()
- && tabIndex == -1
- )
- {
- if (tabRect(i).contains(event->pos()))
- {
- tabIndex = i;
- }
- i++;
- }
+ const int tabIndex = tabAt(event->pos());
// if found and not the current tab then show tab preview
if (tabIndex != -1
diff --git a/src/webview.cpp b/src/webview.cpp
index 0c06a4f8..49fa1032 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -412,9 +412,13 @@ void WebView::mousePressEvent(QMouseEvent *event)
&& !page()->currentFrame()->scrollBarGeometry(Qt::Horizontal).contains(event->pos())
&& !page()->currentFrame()->scrollBarGeometry(Qt::Vertical).contains(event->pos()))
{
- setCursor(KIcon("transform-move").pixmap(32));
- m_clickPos = event->pos();
- m_isAutoScrollEnabled = true;
+ if (!page()->currentFrame()->scrollBarGeometry(Qt::Horizontal).isNull()
+ || !page()->currentFrame()->scrollBarGeometry(Qt::Vertical).isNull())
+ {
+ setCursor(KIcon("transform-move").pixmap(32));
+ m_clickPos = event->pos();
+ m_isAutoScrollEnabled = true;
+ }
}
break;