Update window flags from QToolBarPrivate::endDrag().
Activate previously #ifdef'ed code which cleared the Qt::X11BypassWindowManager hint. With the hint set, the tool bar stays on top and does not get deactivated along with the application by the WM. Task-number: QTBUG-41189 Change-Id: I6f3f334860e46dd4867f5942f15e5a090340f2d7 Reviewed-by: Andy Shaw <andy.shaw@digia.com>bb10
parent
8ee7aa78af
commit
aca0fb1786
|
|
@ -220,10 +220,8 @@ void QToolBarPrivate::endDrag()
|
|||
if (!layout->plug(state->widgetItem)) {
|
||||
if (q->isFloatable()) {
|
||||
layout->restore();
|
||||
#if defined(Q_WS_X11) || defined(Q_WS_MAC)
|
||||
setWindowState(true); // gets rid of the X11BypassWindowManager window flag
|
||||
// and activates the resizer
|
||||
#endif
|
||||
q->activateWindow();
|
||||
} else {
|
||||
layout->revert(state->widgetItem);
|
||||
|
|
|
|||
Loading…
Reference in New Issue