Kaydet (Commit) 19ff1dd4 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski Kaydeden (comit) Thorsten Behrens

KF5 add initial SalObject implementation

Change-Id: Id8d901e9d283ee93cc952e6af267dbafd7f9b9aa
üst 97d52004
......@@ -85,6 +85,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kf5,\
vcl/unx/kf5/Kf5Graphics_Text \
vcl/unx/kf5/Kf5Instance \
vcl/unx/kf5/Kf5Instance_Print \
vcl/unx/kf5/Kf5Object \
vcl/unx/kf5/Kf5Printer \
vcl/unx/kf5/Kf5Timer \
vcl/unx/kf5/Kf5VirtualDevice \
......
......@@ -24,6 +24,7 @@
#include "Kf5Data.hxx"
#include "Kf5Timer.hxx"
#include "Kf5VirtualDevice.hxx"
#include "Kf5Object.hxx"
#include <QtCore/QThread>
#include <QtWidgets/QApplication>
......@@ -77,9 +78,10 @@ void Kf5Instance::DestroyFrame( SalFrame* pFrame )
delete pFrame;
}
SalObject* Kf5Instance::CreateObject( SalFrame*, SystemWindowData*, bool )
SalObject* Kf5Instance::CreateObject( SalFrame* pParent, SystemWindowData*, bool bShow )
{
return new SvpSalObject();
assert( !pParent || dynamic_cast<Kf5Frame*>( pParent ) );
return new Kf5Object( static_cast<Kf5Frame*>( pParent ), bShow );
}
void Kf5Instance::DestroyObject( SalObject* pObject )
......
/* -*- 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 "Kf5Object.hxx"
#include "Kf5Frame.hxx"
#include "Kf5Widget.hxx"
#include <QtWidgets/QWidget>
Kf5Object::Kf5Object( Kf5Frame* pParent, bool bShow )
: m_pParent( pParent )
{
if ( !m_pParent || !pParent->GetQWidget() )
return;
m_pQWidget.reset( new QWidget( pParent->GetQWidget() ) );
if ( bShow )
m_pQWidget->show();
}
Kf5Object::~Kf5Object()
{
}
void Kf5Object::ResetClipRegion()
{
if ( m_pQWidget.get() )
m_pRegion = QRegion( m_pQWidget->geometry() );
else
m_pRegion = QRegion();
}
void Kf5Object::BeginSetClipRegion( sal_uLong )
{
m_pRegion = QRegion();
}
void Kf5Object::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
{
m_pRegion += QRect( nX, nY, nWidth, nHeight );
}
void Kf5Object::EndSetClipRegion()
{
if ( m_pQWidget.get() )
m_pRegion = m_pRegion.intersected( m_pQWidget->geometry() );
}
void Kf5Object::SetPosSize( long nX, long nY, long nWidth, long nHeight )
{
}
void Kf5Object::Show( bool bVisible )
{
if( m_pQWidget )
m_pQWidget->setVisible( bVisible );
}
void Kf5Object::SetForwardKey( bool bEnable )
{
}
const SystemEnvData* Kf5Object::GetSystemData() const
{
return nullptr;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* -*- 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 <memory>
#include <QtGui/QRegion>
class QWidget;
class Kf5Frame;
class Kf5Object : public SalObject
{
SystemEnvData m_aSystemData;
std::unique_ptr< QWidget > m_pQWidget;
Kf5Frame* m_pParent;
QRegion m_pRegion;
public:
Kf5Object( Kf5Frame* pParent, bool bShow );
virtual ~Kf5Object() override;
virtual void ResetClipRegion() override;
virtual void BeginSetClipRegion( sal_uLong nRects ) override;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
virtual void Show( bool bVisible ) override;
virtual void SetForwardKey( bool bEnable ) override;
virtual const SystemEnvData* GetSystemData() const override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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