4366e06052
... and therefore rename it to QtObjectWidget Replacement of the QWidget with QWindow originally happened in commit56b19f9a81("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 commit25edbded99("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
86 lines
2.7 KiB
C++
86 lines
2.7 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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <salobj.hxx>
|
|
#include <vcl/sysdata.hxx>
|
|
|
|
#include <QtCore/QObject>
|
|
#include <QtGui/QRegion>
|
|
#include <QtWidgets/QWidget>
|
|
|
|
class QtFrame;
|
|
class QtObjectWidget;
|
|
class QWindow;
|
|
|
|
class QtObject final : public QObject, public SalObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
SystemEnvData m_aSystemData;
|
|
QtFrame* m_pParent;
|
|
QtObjectWidget* m_pQWidget;
|
|
QRegion m_pRegion;
|
|
bool m_bForwardKey;
|
|
|
|
public:
|
|
QtObject(QtFrame* pParent, bool bShow);
|
|
~QtObject() override;
|
|
|
|
QtFrame* frame() const { return m_pParent; }
|
|
inline QWidget* widget() const;
|
|
QWindow* windowHandle() const;
|
|
bool forwardKey() const { return m_bForwardKey; }
|
|
|
|
virtual void ResetClipRegion() override;
|
|
virtual void BeginSetClipRegion(sal_uInt32 nRects) override;
|
|
virtual void UnionClipRegion(tools::Long nX, tools::Long nY, tools::Long nWidth,
|
|
tools::Long nHeight) override;
|
|
virtual void EndSetClipRegion() override;
|
|
|
|
virtual void SetPosSize(tools::Long nX, tools::Long nY, tools::Long nWidth,
|
|
tools::Long nHeight) override;
|
|
virtual void Show(bool bVisible) override;
|
|
|
|
virtual void SetForwardKey(bool bEnable) override;
|
|
|
|
virtual const SystemEnvData* GetSystemData() const override { return &m_aSystemData; }
|
|
|
|
virtual void Reparent(SalFrame* pFrame) override;
|
|
};
|
|
|
|
class QtObjectWidget final : public QWidget
|
|
{
|
|
QtObject& m_rParent;
|
|
|
|
void focusInEvent(QFocusEvent*) override;
|
|
void focusOutEvent(QFocusEvent*) override;
|
|
void mousePressEvent(QMouseEvent*) override;
|
|
void mouseReleaseEvent(QMouseEvent*) override;
|
|
void keyPressEvent(QKeyEvent*) override;
|
|
void keyReleaseEvent(QKeyEvent*) override;
|
|
|
|
public:
|
|
explicit QtObjectWidget(QtObject& rParent);
|
|
};
|
|
|
|
QWidget* QtObject::widget() const { return m_pQWidget; }
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|