diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2021-01-18 18:27:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-17 12:56:51 +0200 |
commit | 9090dc1f3b27195f5defd35586ac79357992be21 (patch) | |
tree | d39f4b624ae337d5c9ce76eba8521b76e53afa05 /sd/source/ui/func/fuediglu.cxx | |
parent | c8cf2e0e088b74afa52564945a9c005b3b86bf7e (diff) |
split OutputDevice from Window
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>
Diffstat (limited to 'sd/source/ui/func/fuediglu.cxx')
-rw-r--r-- | sd/source/ui/func/fuediglu.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index efbf255f3ef2..25f4b9cf4b66 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -74,7 +74,7 @@ FuEditGluePoints::~FuEditGluePoints() bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) { - mpView->SetActualWin( mpWindow ); + mpView->SetActualWin( mpWindow->GetOutDev() ); bool bReturn = FuDraw::MouseButtonDown(rMEvt); @@ -196,7 +196,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) { - mpView->SetActualWin( mpWindow ); + mpView->SetActualWin( mpWindow->GetOutDev() ); FuDraw::MouseMove(rMEvt); @@ -215,7 +215,7 @@ bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) { - mpView->SetActualWin( mpWindow ); + mpView->SetActualWin( mpWindow->GetOutDev() ); bool bReturn = false; @@ -255,7 +255,7 @@ bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) */ bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) { - mpView->SetActualWin( mpWindow ); + mpView->SetActualWin( mpWindow->GetOutDev() ); //Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, //and SHIFT+ENTER key to decide the position and draw the new insert point @@ -362,7 +362,7 @@ void FuEditGluePoints::ForcePointer(const MouseEvent* pMEvt) bool FuEditGluePoints::Command(const CommandEvent& rCEvt) { - mpView->SetActualWin( mpWindow ); + mpView->SetActualWin( mpWindow->GetOutDev() ); return FuPoor::Command( rCEvt ); } |