9090dc1f3b
as part of a longer-term goal of doing our
widget rendering only inside a top-level render-
context.
I moved all of the OutputDevice-related code that existed in vcl::Window
into a new subclass of OutputDevice called WindowOutputDevice.
Notes for further work
(*) not sure why we are getting an 1x1 surface in
SvpSalGraphics::releaseCairoContext, but to fix it I clamp
the size there
(*) might have to dump VCLXDevice, and move it's code down into VCLXWindow and VCLXVirtualDevice
(*) can we remove use of VCLXDevice in other places, in favour of just talking to the VCL code?
Change-Id: I105946377f5322677d6f7d0c1c23847178a720b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113204
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
57 lines
2.2 KiB
C++
57 lines
2.2 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 <com/sun/star/uno/Reference.hxx>
|
|
#include <com/sun/star/awt/XWindow.hpp>
|
|
#include <vcl/window.hxx>
|
|
|
|
#include "outdevprovider.hxx"
|
|
|
|
namespace vclcanvas
|
|
{
|
|
class WindowOutDevHolder : public OutDevProvider
|
|
{
|
|
public:
|
|
WindowOutDevHolder(const WindowOutDevHolder&) = delete;
|
|
const WindowOutDevHolder operator=(const WindowOutDevHolder&) = delete;
|
|
|
|
explicit WindowOutDevHolder( const css::uno::Reference< css::awt::XWindow>& xWin );
|
|
|
|
private:
|
|
virtual OutputDevice& getOutDev() override { return *mrOutputWindow.GetOutDev(); }
|
|
virtual const OutputDevice& getOutDev() const override { return *mrOutputWindow.GetOutDev(); }
|
|
|
|
// TODO(Q2): Lifetime issue. Though WindowGraphicDeviceBase
|
|
// now listens to the window component, I still consider
|
|
// holding a naked reference unsafe here (especially as we
|
|
// pass it around via getOutDev). This _only_ works reliably,
|
|
// if disposing the SpriteCanvas correctly disposes all
|
|
// entities which hold this pointer.
|
|
// So: as soon as the protocol inside
|
|
// vcl/source/window/window.cxx is broken, that disposes the
|
|
// canvas during window deletion, we're riding a dead horse
|
|
// here
|
|
vcl::Window& mrOutputWindow;
|
|
};
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|