From bb910dd8563cc2c40e47cd99e890fb2d30373308 Mon Sep 17 00:00:00 2001 From: Keith Curtis Date: Thu, 2 Jan 2014 16:01:07 -0500 Subject: hidpi: Sidebar, fontwork, autoformat and other improvements. This is a second batch of HiDPI changes. It fixes the following areas: Sidebar * Impress Master pages preview * deck title height * tab (icon) bar * valueset dropdown control * wider maximum width * Draw and other misc. buttons which didn't get fixed by earlier change to Toolbar.SetItemImage There are several more sidebar issues, but it is much improved. Other changes * Writer and Calc auto-format dialog text * file-properties document image * fontwork gallery preview size * Calc table border control Change-Id: I95a0169a3b011836b1c75b3dcacb2733c9567ef3 Reviewed-on: https://gerrit.libreoffice.org/8519 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- sc/source/ui/miscdlgs/autofmt.cxx | 2 +- sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'sc') diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 425014f378a5..a536b22dbbfa 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -109,7 +109,7 @@ void ScAutoFmtPreview::MakeFonts( sal_uInt16 nIndex, Font& rFont, Font& rCJKFont if ( pCurData ) { rFont = rCJKFont = rCTLFont = GetFont(); - Size aFontSize( rFont.GetSize().Width(), 10 ); + Size aFontSize( rFont.GetSize().Width(), 10 * GetDPIScaleFactor() ); const SvxFontItem* pFontItem = (const SvxFontItem*) pCurData->GetItem( nIndex, ATTR_FONT ); const SvxWeightItem* pWeightItem = (const SvxWeightItem*) pCurData->GetItem( nIndex, ATTR_FONT_WEIGHT ); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src index 00876285015e..4542e4cb184f 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src @@ -167,6 +167,7 @@ Control RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE DialogControl = TRUE; Border = FALSE; + //This is broken with the auto-doubled hidpi bitmaps Size = MAP_PIXEL( POPUPPANEL_MARGIN_SMALL_PIXEL * 2 + 108, POPUPPANEL_MARGIN_SMALL_PIXEL * 2 + 138); ToolBox TB_BORDER1 -- cgit v1.2.3