salframe.cxx (bde8a4bd) salframe.cxx (8a718ffc)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 1205 unchanged lines hidden (view full) ---

1214 aResult.SetHeight( static_cast<int>(([pFont pointSize] * 72.0 / (float)nDPIY)+0.5) );
1215 aResult.SetItalic( ([pFont italicAngle] != 0.0) ? ITALIC_NORMAL : ITALIC_NONE );
1216 // FIMXE: bold ?
1217 }
1218
1219 return aResult;
1220}
1221
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 1205 unchanged lines hidden (view full) ---

1214 aResult.SetHeight( static_cast<int>(([pFont pointSize] * 72.0 / (float)nDPIY)+0.5) );
1215 aResult.SetItalic( ([pFont italicAngle] != 0.0) ? ITALIC_NORMAL : ITALIC_NONE );
1216 // FIMXE: bold ?
1217 }
1218
1219 return aResult;
1220}
1221
1222void AquaSalFrame::getResolution( long& o_rDPIX, long& o_rDPIY )
1222void AquaSalFrame::getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY )
1223{
1224 if( ! mpGraphics )
1225 {
1226 GetGraphics();
1227 ReleaseGraphics( mpGraphics );
1228 }
1229 mpGraphics->GetResolution( o_rDPIX, o_rDPIY );
1230}

--- 28 unchanged lines hidden (view full) ---

1259 aStyleSettings.SetLightBorderColor( aBackgroundColor );
1260 Color aShadowColor( aStyleSettings.GetShadowColor() );
1261 aStyleSettings.SetDarkShadowColor( aShadowColor );
1262 aShadowColor.IncreaseLuminance( 32 );
1263 aStyleSettings.SetShadowColor( aShadowColor );
1264
1265 // get the system font settings
1266 Font aAppFont = aStyleSettings.GetAppFont();
1223{
1224 if( ! mpGraphics )
1225 {
1226 GetGraphics();
1227 ReleaseGraphics( mpGraphics );
1228 }
1229 mpGraphics->GetResolution( o_rDPIX, o_rDPIY );
1230}

--- 28 unchanged lines hidden (view full) ---

1259 aStyleSettings.SetLightBorderColor( aBackgroundColor );
1260 Color aShadowColor( aStyleSettings.GetShadowColor() );
1261 aStyleSettings.SetDarkShadowColor( aShadowColor );
1262 aShadowColor.IncreaseLuminance( 32 );
1263 aStyleSettings.SetShadowColor( aShadowColor );
1264
1265 // get the system font settings
1266 Font aAppFont = aStyleSettings.GetAppFont();
1267 long nDPIX = 72, nDPIY = 72;
1267 sal_Int32 nDPIX = 72, nDPIY = 72;
1268 getResolution( nDPIX, nDPIY );
1269 aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont );
1270
1271 // TODO: better mapping of aqua<->ooo font settings
1272 aStyleSettings.SetAppFont( aAppFont );
1273 aStyleSettings.SetHelpFont( aAppFont );
1274 aStyleSettings.SetPushButtonFont( aAppFont );
1275

--- 513 unchanged lines hidden --- 		1268 getResolution( nDPIX, nDPIY );
1269 aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont );
1270
1271 // TODO: better mapping of aqua<->ooo font settings
1272 aStyleSettings.SetAppFont( aAppFont );
1273 aStyleSettings.SetHelpFont( aAppFont );
1274 aStyleSettings.SetPushButtonFont( aAppFont );
1275

--- 513 unchanged lines hidden ---