Commit f287903f authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

Merge branch 'release/2.9.2'

parents a834ef1f 49d85091
# ChangeLog
## version 2.9.2 - 2019-05-03
- do not move window when we are over a menu button
## version 2.9.1 - 2019-05-02
- call enter/leave method when entering/leaving workspaces
- deactivate unused fileMenu and AboutMenu. Move ThemeMenu in a sub-menu
......
......@@ -24,7 +24,7 @@ project(dtkWidgets)
set(${PROJECT_NAME}_VERSION_MAJOR 2)
set(${PROJECT_NAME}_VERSION_MINOR 9)
set(${PROJECT_NAME}_VERSION_PATCH 1)
set(${PROJECT_NAME}_VERSION_PATCH 2)
set(${PROJECT_NAME}_VERSION
${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
......
......@@ -796,6 +796,11 @@ void dtkWidgetsMenuBar::mousePressEvent(QMouseEvent *event)
void dtkWidgetsMenuBar::mouseMoveEvent(QMouseEvent *event)
{
// do not move window when we are over a menu button
if ((event->pos().y() < ((::size + ::margin) * this->size())) ||
(event->pos().y() > d->c->size().height() - (::size + ::margin)))
return;
d->c_pos = event->globalPos();
d->d_pos = d->c_pos - d->o_pos;
......
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