Commit 17eeee6b authored by Aniket Anvit's avatar Aniket Anvit Committed by Frank Reininghaus

Apply changes of the KGlobalSettings::singleClick() setting immediately

Fixes a regression introduced by commit
7a364cbf.

Patch reviewed and pushed by Frank Reininghaus.

BUG: 313342
FIXED-IN: 4.10.1
parent 35fa9875
......@@ -44,7 +44,7 @@
KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
QObject(parent),
m_singleClickActivation(KGlobalSettings::singleClick()),
m_singleClickActivationEnforced(false),
m_selectionTogglePressed(false),
m_clearSelectionIfItemsAreNotDragged(false),
m_selectionBehavior(NoSelection),
......@@ -190,14 +190,14 @@ int KItemListController::autoActivationDelay() const
return m_autoActivationTimer->interval();
}
void KItemListController::setSingleClickActivation(bool singleClick)
void KItemListController::setSingleClickActivationEnforced(bool singleClick)
{
m_singleClickActivation = singleClick;
m_singleClickActivationEnforced = singleClick;
}
bool KItemListController::singleClickActivation() const
bool KItemListController::singleClickActivationEnforced() const
{
return m_singleClickActivation;
return m_singleClickActivationEnforced;
}
bool KItemListController::showEvent(QShowEvent* event)
......@@ -756,7 +756,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
} else if (shiftOrControlPressed) {
// The mouse click should only update the selection, not trigger the item
emitItemActivated = false;
} else if (!m_singleClickActivation) {
} else if (!(KGlobalSettings::singleClick() || m_singleClickActivationEnforced)) {
emitItemActivated = false;
}
if (emitItemActivated) {
......@@ -786,7 +786,7 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event,
}
}
bool emitItemActivated = !m_singleClickActivation &&
bool emitItemActivated = !(KGlobalSettings::singleClick() || m_singleClickActivationEnforced) &&
(event->button() & Qt::LeftButton) &&
index >= 0 && index < m_model->count();
if (emitItemActivated) {
......
......@@ -129,12 +129,11 @@ public:
/**
* If set to true, the signals itemActivated() and itemsActivated() are emitted
* after a single-click of the left mouse button. If set to false, a double-click
* is required. Per default the setting from KGlobalSettings::singleClick() is
* used.
* after a single-click of the left mouse button. If set to false (the default),
* the setting from KGlobalSettings::singleClick() is used.
*/
void setSingleClickActivation(bool singleClick);
bool singleClickActivation() const;
void setSingleClickActivationEnforced(bool singleClick);
bool singleClickActivationEnforced() const;
virtual bool showEvent(QShowEvent* event);
virtual bool hideEvent(QHideEvent* event);
......@@ -301,7 +300,7 @@ private:
void updateExtendedSelectionRegion();
private:
bool m_singleClickActivation;
bool m_singleClickActivationEnforced;
bool m_selectionTogglePressed;
bool m_clearSelectionIfItemsAreNotDragged;
SelectionBehavior m_selectionBehavior;
......
......@@ -152,7 +152,7 @@ void FoldersPanel::showEvent(QShowEvent* event)
m_controller->setAutoActivationBehavior(KItemListController::ExpansionOnly);
m_controller->setMouseDoubleClickAction(KItemListController::ActivateAndExpandItem);
m_controller->setAutoActivationDelay(750);
m_controller->setSingleClickActivation(true);
m_controller->setSingleClickActivationEnforced(true);
connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
......
......@@ -110,7 +110,7 @@ void PlacesPanel::showEvent(QShowEvent* event)
m_controller = new KItemListController(m_model, m_view, this);
m_controller->setSelectionBehavior(KItemListController::SingleSelection);
m_controller->setSingleClickActivation(true);
m_controller->setSingleClickActivationEnforced(true);
readSettings();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment