diff options
| author | Chirag Manwani <cmkmanwani@gmail.com> | 2016-03-18 11:09:04 +0530 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-03-28 01:54:35 +0000 |
| commit | d31a6e77478d36798a0b410f6977cda51ae45360 (patch) | |
| tree | 84621fd281091e19ad67e1fb3e6edc3a2e1f5ef0 /svtools | |
| parent | 454ad54ccfbfd09c46a46211a9469d3d85050fbd (diff) | |
tdf#90795 Fix Hyperlink Dialog for HiDPI
Change-Id: I30964d3bd3b5c4433e72be45bfa0202661248051
Reviewed-on: https://gerrit.libreoffice.org/23347
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 14 | ||||
| -rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index dbfb1d1cf0d8..794fdfca4fbb 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -94,7 +94,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( aVerSBar( VclPtr<ScrollBar>::Create(pCurView, WB_DRAG | WB_VSCROLL) ), aHorSBar( VclPtr<ScrollBar>::Create(pCurView, WB_DRAG | WB_HSCROLL) ), aScrBarBox( VclPtr<ScrollBarBox>::Create(pCurView) ), - aImageSize( 32, 32 ), + aImageSize( 32 * pCurView->GetDPIScaleFactor(), 32 * pCurView->GetDPIScaleFactor()), m_pColumns( nullptr ) { bChooseWithCursor = false; @@ -147,8 +147,12 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( aVisRectChangedIdle.SetIdleHdl(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl)); Clear( true ); - - SetGrid( Size(100, 70) ); + Size gridSize(100,70); + if(pView->GetDPIScaleFactor() > 1) + { + gridSize.Height() *= pView->GetDPIScaleFactor(); + } + SetGrid(gridSize); } SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl() @@ -2420,6 +2424,10 @@ void SvxIconChoiceCtrl_Impl::SetDefaultTextSize() long nHeight = pView->GetTextHeight(); if (nDY < nHeight) nDY = nHeight; + if(pView->GetDPIScaleFactor() > 1) + { + nDY*=2; + } aDefaultTextSize = Size(nDX, nDY); } diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index e2480983003a..43041ecbf1ac 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -80,7 +80,6 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle ) { SetLineColor(); - _pImp->SetGrid( Size( 100, 70 ) ); _pImp->InitSettings(); _pImp->SetPositionMode( IcnViewPositionModeAutoArrange ); } |