diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2023-08-25 18:01:32 +0200 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2023-08-31 10:15:45 +0200 |
commit | 3fad74eb9def27788faddd74f5285120e0aefdd9 (patch) | |
tree | 6268c8401e3e375e51ebc5715d7b6899185678fc /include/vcl | |
parent | eecf74196b852cddaaffbf7e0442fd2abbc36a5d (diff) |
jsdialog: render font previews with hidpi
we pass dpi scale, let's use it to determine combobox entry size
Change-Id: I4088eca565b301c5693e52b1c05af1a335fc34fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156115
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156251
Tested-by: Jenkins
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/weldutils.hxx | 3 | ||||
-rw-r--r-- | include/vcl/window.hxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx index 8a4c128515a0..1987066badf8 100644 --- a/include/vcl/weldutils.hxx +++ b/include/vcl/weldutils.hxx @@ -464,7 +464,8 @@ VCL_DLLPUBLIC int GetMinimumEditHeight(); VCL_DLLPUBLIC weld::Window* GetPopupParent(vcl::Window& rOutWin, tools::Rectangle& rRect); // Use Application::GetDefaultDevice to set the PointFont rFont to the OutputDevice -VCL_DLLPUBLIC void SetPointFont(OutputDevice& rDevice, const vcl::Font& rFont); +VCL_DLLPUBLIC void SetPointFont(OutputDevice& rDevice, const vcl::Font& rFont, + bool bUseDeviceDPI = false); } #endif diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 0f9c6f3f45b5..73f2e4e5bc03 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -615,7 +615,7 @@ private: SAL_DLLPRIVATE void ImplInitResolutionSettings(); - SAL_DLLPRIVATE void ImplPointToLogic(vcl::RenderContext const & rRenderContext, vcl::Font& rFont) const; + SAL_DLLPRIVATE void ImplPointToLogic(vcl::RenderContext const & rRenderContext, vcl::Font& rFont, bool bUseRenderContextDPI = false) const; SAL_DLLPRIVATE void ImplLogicToPoint(vcl::RenderContext const & rRenderContext, vcl::Font& rFont) const; SAL_DLLPRIVATE bool ImplSysObjClip( const vcl::Region* pOldRegion ); @@ -833,7 +833,7 @@ public: void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); void NotifyAllChildren( DataChangedEvent& rDCEvt ); - void SetPointFont(vcl::RenderContext& rRenderContext, const vcl::Font& rFont); + void SetPointFont(vcl::RenderContext& rRenderContext, const vcl::Font& rFont, bool bUseRenderContextDPI = false); vcl::Font GetPointFont(vcl::RenderContext const & rRenderContext) const; void SetZoomedPointFont(vcl::RenderContext& rRenderContext, const vcl::Font& rFont); tools::Long GetDrawPixel( ::OutputDevice const * pDev, tools::Long nPixels ) const; |