office-gobmx/vcl/qt5/QtObject.cxx
Jan-Marek Glogowski 4366e06052 tdf#148864 Qt switch QtObjectWindow to QWidget
... and therefore rename it to QtObjectWidget

Replacement of the QWidget with QWindow originally happened in
commit 56b19f9a81 ("tdf#121247,
tdf#121266 KDE5: Add basic support for OpenGL"), but that
unfortunately has a very sparce commit message with no reason
for this change. Then the code was further complicated in commit
25edbded99 ("tdf#125517 Qt5
implement a minimal Qt5ObjectWindow") and a few follow up fixes
to restore input and focus handling.

But appearingly all this QWindow handling isn't necessary and just
returning to a QWidget based class fixes the problems with the
video overlay (AKA QWidget::winId()) and video playback for good.

The OpenGL Impress transition (Fade) mentioned in the original
tdf#121266 bug still works.

This also adds the previously missing SolarMutexGuard to all the
overridden QtObjectWidget functions, which call the SalObject's
Callback function. I accidently triggered a DBG_TESTSOLARMUTEX
crashing Impress while debugging this.

Change-Id: Ia22cabfd4f3585dc7fa3f9f18a913c5bd1987dd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134864
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
2022-05-25 13:53:46 +02:00

155 lines
3.9 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <QtObject.hxx>
#include <QtObject.moc>
#include <QtFrame.hxx>
#include <QtWidget.hxx>
#include <QtGui/QGuiApplication>
#include <QtGui/QKeyEvent>
#include <QtGui/QMouseEvent>
QtObject::QtObject(QtFrame* pParent, bool bShow)
: m_pParent(pParent)
, m_pQWidget(nullptr)
, m_bForwardKey(false)
{
if (!m_pParent || !pParent->GetQWidget())
return;
m_pQWidget = new QtObjectWidget(*this);
if (bShow)
m_pQWidget->show();
QtFrame::FillSystemEnvData(m_aSystemData, reinterpret_cast<sal_IntPtr>(this), m_pQWidget);
}
QtObject::~QtObject()
{
if (m_pQWidget)
{
m_pQWidget->setParent(nullptr);
delete m_pQWidget;
}
}
QWindow* QtObject::windowHandle() const
{
return m_pQWidget ? m_pQWidget->windowHandle() : nullptr;
}
void QtObject::ResetClipRegion()
{
if (m_pQWidget)
m_pRegion = QRegion(m_pQWidget->geometry());
else
m_pRegion = QRegion();
}
void QtObject::BeginSetClipRegion(sal_uInt32) { m_pRegion = QRegion(); }
void QtObject::UnionClipRegion(tools::Long nX, tools::Long nY, tools::Long nWidth,
tools::Long nHeight)
{
m_pRegion += QRect(nX, nY, nWidth, nHeight);
}
void QtObject::EndSetClipRegion()
{
if (m_pQWidget)
m_pRegion = m_pRegion.intersected(m_pQWidget->geometry());
}
void QtObject::SetPosSize(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight)
{
if (m_pQWidget)
{
m_pQWidget->move(nX, nY);
m_pQWidget->setFixedSize(nWidth, nHeight);
}
}
void QtObject::Show(bool bVisible)
{
if (m_pQWidget)
m_pQWidget->setVisible(bVisible);
}
void QtObject::SetForwardKey(bool bEnable) { m_bForwardKey = bEnable; }
void QtObject::Reparent(SalFrame* pFrame)
{
QtFrame* pNewParent = static_cast<QtFrame*>(pFrame);
if (m_pParent == pNewParent)
return;
m_pParent = pNewParent;
m_pQWidget->setParent(m_pParent->GetQWidget());
}
QtObjectWidget::QtObjectWidget(QtObject& rParent)
: QWidget(rParent.frame()->GetQWidget())
, m_rParent(rParent)
{
assert(m_rParent.frame() && m_rParent.frame()->GetQWidget());
setAttribute(Qt::WA_NoSystemBackground);
setAttribute(Qt::WA_OpaquePaintEvent);
}
void QtObjectWidget::focusInEvent(QFocusEvent*)
{
SolarMutexGuard aGuard;
m_rParent.CallCallback(SalObjEvent::GetFocus);
}
void QtObjectWidget::focusOutEvent(QFocusEvent*)
{
SolarMutexGuard aGuard;
m_rParent.CallCallback(SalObjEvent::LoseFocus);
}
void QtObjectWidget::mousePressEvent(QMouseEvent* pEvent)
{
SolarMutexGuard aGuard;
m_rParent.CallCallback(SalObjEvent::ToTop);
if (m_rParent.forwardKey())
pEvent->ignore();
}
void QtObjectWidget::mouseReleaseEvent(QMouseEvent* pEvent)
{
if (m_rParent.forwardKey())
pEvent->ignore();
}
void QtObjectWidget::keyReleaseEvent(QKeyEvent* pEvent)
{
if (m_rParent.forwardKey())
pEvent->ignore();
}
void QtObjectWidget::keyPressEvent(QKeyEvent* pEvent)
{
if (m_rParent.forwardKey())
pEvent->ignore();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */