mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
[Fix] Don't show instant popup when clicking on back/forward button.
This commit is contained in:
parent
79c57f61b6
commit
93d22ec6fc
|
@ -1,3 +1,7 @@
|
||||||
|
Version 1.4.1
|
||||||
|
* not yet released
|
||||||
|
* fixed instantly showing popup when clicking on back/forward button
|
||||||
|
|
||||||
Version 1.4.0
|
Version 1.4.0
|
||||||
* released 11 March 2013
|
* released 11 March 2013
|
||||||
* highlighting host in address in locationbar
|
* highlighting host in address in locationbar
|
||||||
|
|
|
@ -92,12 +92,19 @@ void ToolButton::setMultiIcon(const QPixmap &image)
|
||||||
|
|
||||||
void ToolButton::mousePressEvent(QMouseEvent* e)
|
void ToolButton::mousePressEvent(QMouseEvent* e)
|
||||||
{
|
{
|
||||||
if (e->button() != Qt::MiddleButton && menu()) {
|
if (e->button() == Qt::LeftButton && menu() && popupMode() == QToolButton::InstantPopup) {
|
||||||
setDown(true);
|
setDown(true);
|
||||||
showMenu();
|
showMenu();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (e->button() == Qt::RightButton && menu()) {
|
||||||
|
setDown(true);
|
||||||
|
showMenu();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (e->button() == Qt::MiddleButton) {
|
if (e->button() == Qt::MiddleButton) {
|
||||||
setDown(true);
|
setDown(true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user