diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-05-12 20:01:05 +1000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-30 06:09:49 +0200 |
| commit | a2c8195f465a2e4346169d2b586c34e8fbed253c (patch) | |
| tree | 2ad0a45dfebaaa63e26f96ce244486cf1d0598e4 /toolkit | |
| parent | 229136b7c9363bc758c9e925ccfd0c9bb34ceaec (diff) | |
tdf#74702 vcl: introduce GetSystemTextColor()
Also rename DrawFlags to SystemDrawColorFlags, added a unit test.
Change-Id: I3cb74b278e43561d1055b3b55b9730cdbdea51aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113559
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/controls/filectrl.hxx | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtabpagecontainer.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 8 | ||||
| -rw-r--r-- | toolkit/source/controls/filectrl.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/toolkit/inc/controls/filectrl.hxx b/toolkit/inc/controls/filectrl.hxx index 9c98a10c2335..1330d0ce7cb5 100644 --- a/toolkit/inc/controls/filectrl.hxx +++ b/toolkit/inc/controls/filectrl.hxx @@ -58,7 +58,7 @@ public: Edit& GetEdit() { return *maEdit; } PushButton& GetButton() { return *maButton; } - void Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags ) override; + void Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) override; void SetText( const OUString& rStr ) override; OUString GetText() const override; diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 42751be785cf..e5b74a7f5443 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -65,7 +65,7 @@ void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY ) { ::Point aPos( nX, nY ); aPos = pDev->PixelToLogic( aPos ); - pTabPage->Draw( pDev, aPos, DrawFlags::NONE ); + pTabPage->Draw( pDev, aPos, SystemTextColorFlags::NONE ); } } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 28eb6942fe6c..1292bcea88c0 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -2243,7 +2243,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) { Point aPos( nX, nY ); aPos = pDev->PixelToLogic( aPos ); - pTabPage->Draw( pDev, aPos, DrawFlags::NONE ); + pTabPage->Draw( pDev, aPos, SystemTextColorFlags::NONE ); return; } @@ -2298,7 +2298,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) || ( pPDFExport != nullptr ); if ( bDrawSimple ) { - pWindow->Draw( pDev, aP, DrawFlags::NoControls ); + pWindow->Draw( pDev, aP, SystemTextColorFlags::NoControls ); } else { diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index a8535b0fd258..6c786a5991ab 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2391,7 +2391,7 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) pDev = pWindow->GetParent()->GetOutDev(); Point aPos = pDev->PixelToLogic( Point( nX, nY ) ); - pWindow->Draw( pDev, aPos, DrawFlags::NoControls ); + pWindow->Draw( pDev, aPos, SystemTextColorFlags::NoControls ); } } @@ -2512,7 +2512,7 @@ void SAL_CALL VCLXMultiPage::draw( sal_Int32 nX, sal_Int32 nY ) pDev = pWindow->GetParent()->GetOutDev(); Point aPos = pDev->PixelToLogic( Point( nX, nY ) ); - pWindow->Draw( pDev, aPos, DrawFlags::NoControls ); + pWindow->Draw( pDev, aPos, SystemTextColorFlags::NoControls ); } } @@ -2757,7 +2757,7 @@ void SAL_CALL VCLXTabPage::draw( sal_Int32 nX, sal_Int32 nY ) pDev = pWindow->GetParent()->GetOutDev(); Point aPos = pDev->PixelToLogic( Point( nX, nY ) ); - pWindow->Draw( pDev, aPos, DrawFlags::NoControls ); + pWindow->Draw( pDev, aPos, SystemTextColorFlags::NoControls ); } } @@ -6245,7 +6245,7 @@ void SAL_CALL VCLXFrame::draw( sal_Int32 nX, sal_Int32 nY ) pDev = pWindow->GetParent()->GetOutDev(); Point aPos = pDev->PixelToLogic( Point( nX, nY ) ); - pWindow->Draw( pDev, aPos, DrawFlags::NoControls ); + pWindow->Draw( pDev, aPos, SystemTextColorFlags::NoControls ); } } diff --git a/toolkit/source/controls/filectrl.cxx b/toolkit/source/controls/filectrl.cxx index e2bc14ed0311..0827f9127d47 100644 --- a/toolkit/source/controls/filectrl.cxx +++ b/toolkit/source/controls/filectrl.cxx @@ -188,7 +188,7 @@ void FileControl::SetEditModifyHdl( const Link<Edit&,void>& rLink ) maEdit->SetModifyHdl(rLink); } -void FileControl::Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags ) +void FileControl::Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) { WinBits nOldEditStyle = GetEdit().GetStyle(); if ( GetStyle() & WB_BORDER ) |