ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Fixed history dropdown click opened again when clicking on history button on Windows

Browse Source
This commit is contained in:
Eberhard Graether
2017-12-15 15:38:43 +01:00
parent 76f5ee1dc0
commit 618ed72241
7 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtUndoRedo.cpp
+28 -2
View File
@@ -15,6 +15,8 @@
QtUndoRedo::QtUndoRedo()
: m_pressed(false)
, m_historyList(nullptr)
, m_historyHiddenAt(TimeStamp::now())
{
setObjectName("undo_redo_bar");
@@ -62,6 +64,11 @@ QtUndoRedo::~QtUndoRedo()
void QtUndoRedo::buttonPressed()
{
if (TimeStamp::now().deltaMS(m_historyHiddenAt) < 250)
{
return;
}
m_pressed = true;
QTimer::singleShot(250, this, &QtUndoRedo::showHistory);
m_historyButton->setAttribute(Qt::WA_UnderMouse, false);
@@ -91,6 +98,12 @@ void QtUndoRedo::showHistory()
{
m_pressed = false;
if (m_historyList)
{
m_historyList->deleteLater();
m_historyList = nullptr;
}
m_undoButton->setDown(false);
m_redoButton->setDown(false);
m_historyButton->setDown(false);
@@ -99,11 +112,24 @@ void QtUndoRedo::showHistory()
m_redoButton->setAttribute(Qt::WA_UnderMouse, false);
m_historyButton->setAttribute(Qt::WA_UnderMouse, false);
QtHistoryList* list = new QtHistoryList(m_history, m_currentIndex);
m_historyList = new QtHistoryList(m_history, m_currentIndex);
QPoint pos = m_undoButton->mapToGlobal(m_undoButton->pos());
list->showPopup(QPoint(pos.x(), pos.y() + m_undoButton->size().height() + 5));
m_historyList->showPopup(QPoint(pos.x(), pos.y() + m_undoButton->size().height() + 5));
connect(m_historyList, &QtHistoryList::closed, this, &QtUndoRedo::hidHistory);
}
}
void QtUndoRedo::hidHistory()
{
if (m_historyList)
{
m_historyList->deleteLater();
m_historyList = nullptr;
m_historyHiddenAt = TimeStamp::now();
}
}