mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor "TextEdit" & co. to use RenderContext

Browse Source 
Change-Id: Ib26ecb9640d23714acec73304f26e2fd6af90ed4
This commit is contained in:
Tomaž Vajngerl
2015-05-06 15:49:16 +09:00
committed by Jan Holesovsky
parent c299413c6d
commit 29b1e6718f
6 changed files with 57 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
basctl/source/basicide/baside2b.cxx
View File

@@ -915,12 +915,12 @@ void EditorWindow::SetupAndShowCodeCompleteWnd( const std::vector< OUString >& a
pEditView->GetWindow()->GrabFocus(); pEditView->GetWindow()->GrabFocus();
} }
void EditorWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) void EditorWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{ {
if (!pEditEngine) // We need it now at latest if (!pEditEngine) // We need it now at latest
CreateEditEngine(); CreateEditEngine();
pEditView->Paint( rRect ); pEditView->Paint(rRenderContext, rRect);
} }
void EditorWindow::LoseFocus() void EditorWindow::LoseFocus()

15
include/vcl/textview.hxx
View File

@@ -25,10 +25,11 @@
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <vcl/dndhelp.hxx> #include <vcl/dndhelp.hxx>
#include <vcl/textdata.hxx> #include <vcl/textdata.hxx>
#include <vcl/window.hxx>
class TextEngine; class TextEngine;
class OutputDevice; class OutputDevice;
namespace vcl { class Window; }
class KeyEvent; class KeyEvent;
class MouseEvent; class MouseEvent;
class CommandEvent; class CommandEvent;
@@ -37,11 +38,7 @@ class SelectionEngine;
class VirtualDevice; class VirtualDevice;
struct TextDDInfo; struct TextDDInfo;
namespace com { namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
namespace sun {
namespace star {
namespace datatransfer {
namespace clipboard {
class XClipboard; class XClipboard;
}}}}} }}}}}
@@ -72,8 +69,8 @@ protected:
void ImpSetSelection( const TextSelection& rNewSel, bool bUI ); void ImpSetSelection( const TextSelection& rNewSel, bool bUI );
bool IsInSelection( const TextPaM& rPaM ); bool IsInSelection( const TextPaM& rPaM );
void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 ); void ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0);
void ImpPaint( const Rectangle& rRect, bool bUseVirtDev ); void ImpPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bUseVirtDev);
void ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bEndKey ); void ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bEndKey );
void ImpHighlight( const TextSelection& rSel ); void ImpHighlight( const TextSelection& rSel );
void ImpSetSelection( const TextSelection& rSelection ); void ImpSetSelection( const TextSelection& rSelection );
@@ -128,7 +125,7 @@ public:
void InsertText( const OUString& rNew, bool bSelect = false ); void InsertText( const OUString& rNew, bool bSelect = false );
bool KeyInput( const KeyEvent& rKeyEvent ); bool KeyInput( const KeyEvent& rKeyEvent );
void Paint( const Rectangle& rRect ); void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
void MouseButtonUp( const MouseEvent& rMouseEvent ); void MouseButtonUp( const MouseEvent& rMouseEvent );
void MouseButtonDown( const MouseEvent& rMouseEvent ); void MouseButtonDown( const MouseEvent& rMouseEvent );
void MouseMove( const MouseEvent& rMouseEvent ); void MouseMove( const MouseEvent& rMouseEvent );

4
sw/source/uibase/docvw/srcedtw.cxx
View File

@@ -478,9 +478,9 @@ void TextViewOutWin::KeyInput( const KeyEvent& rKEvt )
} }
} }
void TextViewOutWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) void TextViewOutWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{ {
pTextView->Paint( rRect ); pTextView->Paint(rRenderContext, rRect);
} }
void SwSrcEditWindow::CreateTextEngine() void SwSrcEditWindow::CreateTextEngine()

3
vcl/source/edit/texteng.cxx
View File

@@ -1499,9 +1499,6 @@ void TextEngine::UpdateViews( TextView* pCurView )
aNewPos.X() -= aOutSz.Width() - 1; aNewPos.X() -= aOutSz.Width() - 1;
aClipRect.SetPos( aNewPos ); aClipRect.SetPos( aNewPos );
if ( pView == pCurView )
pView->ImpPaint( aClipRect, !pView->GetWindow()->IsPaintTransparent() );
else
pView->GetWindow()->Invalidate( aClipRect ); pView->GetWindow()->Invalidate( aClipRect );
} }
} }

32
vcl/source/edit/textview.cxx
View File

@@ -293,16 +293,18 @@ void TextView::DeleteSelected()
ShowCursor(); ShowCursor();
} }
void TextView::ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange, TextSelection const* pSelection ) void TextView::ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange, TextSelection const* pSelection)
{ {
if (!mpImpl->mbPaintSelection) if (!mpImpl->mbPaintSelection)
{
pSelection = NULL; pSelection = NULL;
}
else else
{ {
// set correct background color; // set correct background color;
// unfortunately we cannot detect if it has changed // unfortunately we cannot detect if it has changed
vcl::Font aFont = mpImpl->mpTextEngine->GetFont(); vcl::Font aFont = mpImpl->mpTextEngine->GetFont();
Color aColor = pOut->GetBackground().GetColor(); Color aColor = rRenderContext.GetBackground().GetColor();
aColor.SetTransparency(0); aColor.SetTransparency(0);
if (aColor != aFont.GetFillColor()) if (aColor != aFont.GetFillColor())
{ {
@@ -313,15 +315,15 @@ void TextView::ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle c
} }
} }
mpImpl->mpTextEngine->ImpPaint( pOut, rStartPos, pPaintArea, pPaintRange, pSelection ); mpImpl->mpTextEngine->ImpPaint(&rRenderContext, rStartPos, pPaintArea, pPaintRange, pSelection);
} }
void TextView::Paint( const Rectangle& rRect ) void TextView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{ {
ImpPaint( rRect, false ); ImpPaint(rRenderContext, rRect, false);
} }
void TextView::ImpPaint( const Rectangle& rRect, bool bUseVirtDev ) void TextView::ImpPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bUseVirtDev)
{ {
if ( !mpImpl->mpTextEngine->GetUpdateMode() || mpImpl->mpTextEngine->IsInUndo() ) if ( !mpImpl->mpTextEngine->GetUpdateMode() || mpImpl->mpTextEngine->IsInUndo() )
return; return;
@@ -363,7 +365,7 @@ void TextView::ImpPaint( const Rectangle& rRect, bool bUseVirtDev )
} }
if (!bVDevValid) if (!bVDevValid)
{ {
ImpPaint( rRect, false /* without VDev */ ); ImpPaint(rRenderContext, rRect, false);
return; return;
} }
@@ -371,19 +373,15 @@ void TextView::ImpPaint( const Rectangle& rRect, bool bUseVirtDev )
Point aDocPos(mpImpl->maStartDocPos.X(), mpImpl->maStartDocPos.Y() + rRect.Top()); Point aDocPos(mpImpl->maStartDocPos.X(), mpImpl->maStartDocPos.Y() + rRect.Top());
Point aStartPos = ImpGetOutputStartPos(aDocPos); Point aStartPos = ImpGetOutputStartPos(aDocPos);
ImpPaint( pVDev, aStartPos, &aTmpRect, NULL, pDrawSelection ); ImpPaint(*pVDev, aStartPos, &aTmpRect, NULL, pDrawSelection);
mpImpl->mpWindow->DrawOutDev( rRect.TopLeft(), rRect.GetSize(), rRenderContext.DrawOutDev(rRect.TopLeft(), rRect.GetSize(), Point(0,0), rRect.GetSize(), *pVDev);
Point(0,0), rRect.GetSize(), *pVDev );
// ShowSelection();
if (mpImpl->mbHighlightSelection) if (mpImpl->mbHighlightSelection)
ImpHighlight(mpImpl->maSelection); ImpHighlight(mpImpl->maSelection);
} }
else else
{ {
Point aStartPos = ImpGetOutputStartPos(mpImpl->maStartDocPos); Point aStartPos = ImpGetOutputStartPos(mpImpl->maStartDocPos);
ImpPaint( mpImpl->mpWindow, aStartPos, &rRect, NULL, pDrawSelection ); ImpPaint(rRenderContext, aStartPos, &rRect, NULL, pDrawSelection);
// ShowSelection();
if (mpImpl->mbHighlightSelection) if (mpImpl->mbHighlightSelection)
ImpHighlight(mpImpl->maSelection); ImpHighlight(mpImpl->maSelection);
} }
@@ -499,7 +497,7 @@ void TextView::ShowSelection( const TextSelection& rRange )
ImpShowHideSelection( true, &rRange ); ImpShowHideSelection( true, &rRange );
} }
void TextView::ImpShowHideSelection( bool bShow, const TextSelection* pRange ) void TextView::ImpShowHideSelection(bool /*bShow*/, const TextSelection* pRange)
{ {
const TextSelection* pRangeOrSelection = pRange ? pRange : &mpImpl->maSelection; const TextSelection* pRangeOrSelection = pRange ? pRange : &mpImpl->maSelection;
@@ -515,13 +513,11 @@ void TextView::ImpShowHideSelection( bool bShow, const TextSelection* pRange )
mpImpl->mpWindow->Invalidate(); mpImpl->mpWindow->Invalidate();
else else
{ {
Rectangle aOutArea( Point( 0, 0 ), mpImpl->mpWindow->GetOutputSizePixel() );
Point aStartPos( ImpGetOutputStartPos( mpImpl->maStartDocPos ) );
TextSelection aRange( *pRangeOrSelection ); TextSelection aRange( *pRangeOrSelection );
aRange.Justify(); aRange.Justify();
bool bVisCursor = mpImpl->mpCursor->IsVisible(); bool bVisCursor = mpImpl->mpCursor->IsVisible();
mpImpl->mpCursor->Hide(); mpImpl->mpCursor->Hide();
ImpPaint( mpImpl->mpWindow, aStartPos, &aOutArea, &aRange, bShow ? &mpImpl->maSelection : NULL ); Invalidate();
if (bVisCursor) if (bVisCursor)
mpImpl->mpCursor->Show(); mpImpl->mpCursor->Show();
} }

6
vcl/source/edit/vclmedit.cxx
View File

@@ -60,7 +60,7 @@ public:
virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE;
@@ -807,9 +807,9 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent )
Window::KeyInput( rKEvent ); Window::KeyInput( rKEvent );
} }
void TextWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) void TextWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{ {
mpExtTextView->Paint( rRect ); mpExtTextView->Paint(rRenderContext, rRect);
} }
void TextWindow::Resize() void TextWindow::Resize()