From e94a5a3b39be5d16ca0bf395bed32e38254bd2a1 Mon Sep 17 00:00:00 2001 From: Felix Rohrbach Date: Sat, 8 Jan 2011 15:24:43 +0100 Subject: Multi-scroll cursors doesn't appear when the page does not have scroll bars, anymore. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Furkan Üzümcü RB: 100314 --- src/webview.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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; -- cgit v1.2.1 From de39729f4e3864aec6c0366ac72ca5f1228d60d1 Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Sun, 9 Jan 2011 02:37:24 +0530 Subject: =?UTF-8?q?Use=20Escape=20shortcut=20to=20stop=20web=20loading=20T?= =?UTF-8?q?hanks=20to=20Furkan=20=C3=9Cz=C3=BCmc=C3=BC=20Review=20Board=20?= =?UTF-8?q?request=20:=20http://git.reviewboard.kde.org/r/100322/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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())); -- cgit v1.2.1 From 914b0c1c0d2440bee0675ef9b77bad9d40630903 Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Sun, 9 Jan 2011 03:14:04 +0530 Subject: =?UTF-8?q?Tab=20bar=20preview=20optimization,=20use=20event->pos(?= =?UTF-8?q?)=20to=20get=20the=20position=20of=20tab=20instead=20of=20cycli?= =?UTF-8?q?ng=20=20with=20a=20while=20loop=20Thanks=20to=20Furkan=20=C3=9C?= =?UTF-8?q?z=C3=BCmc=C3=BC=20Review=20Board=20request=20:=20http://git.rev?= =?UTF-8?q?iewboard.kde.org/r/100324/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tabbar.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) 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 -- cgit v1.2.1