Theme.cxx (37fee4fd) Theme.cxx (df0345d7)
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

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

213
214 try
215 {
216 const StyleSettings& rStyle (Application::GetSettings().GetStyleSettings());
217 const bool bUseSystemColors (GetBoolean(Bool_UseSystemColors));
218
219#define Alternatives(n,hc,sys) (mbIsHighContrastMode ? hc : (bUseSystemColors ? sys : n))
220
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

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

213
214 try
215 {
216 const StyleSettings& rStyle (Application::GetSettings().GetStyleSettings());
217 const bool bUseSystemColors (GetBoolean(Bool_UseSystemColors));
218
219#define Alternatives(n,hc,sys) (mbIsHighContrastMode ? hc : (bUseSystemColors ? sys : n))
220
221 const Color aBaseBackgroundColor (rStyle.GetDialogColor());
221 Color aBaseBackgroundColor (rStyle.GetDialogColor());
222 // UX says this should be a little brighter, but that looks off when compared to the other windows.
223 //aBaseBackgroundColor.IncreaseLuminance(7);
222 Color aBorderColor (aBaseBackgroundColor);
223 aBorderColor.DecreaseLuminance(15);
224 Color aSecondColor (aBaseBackgroundColor);
225 aSecondColor.DecreaseLuminance(15);
226
227 setPropertyValue(
228 maPropertyIdToNameMap[Paint_DeckBackground],
224 Color aBorderColor (aBaseBackgroundColor);
225 aBorderColor.DecreaseLuminance(15);
226 Color aSecondColor (aBaseBackgroundColor);
227 aSecondColor.DecreaseLuminance(15);
228
229 setPropertyValue(
230 maPropertyIdToNameMap[Paint_DeckBackground],
229 Any(sal_Int32(rStyle.GetMenuColor().GetRGBColor())));
231 Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
230
231 setPropertyValue(
232 maPropertyIdToNameMap[Paint_DeckTitleBarBackground],
233 Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
234 setPropertyValue(
235 maPropertyIdToNameMap[Int_DeckLeftPadding],
236 Any(sal_Int32(2)));
237 setPropertyValue(

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

258 setPropertyValue(
259 maPropertyIdToNameMap[Int_DeckTitleBarHeight],
260 Any(sal_Int32(Alternatives(
261 26,
262 26,
263 rStyle.GetFloatTitleHeight()))));
264 setPropertyValue(
265 maPropertyIdToNameMap[Paint_PanelBackground],
232
233 setPropertyValue(
234 maPropertyIdToNameMap[Paint_DeckTitleBarBackground],
235 Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
236 setPropertyValue(
237 maPropertyIdToNameMap[Int_DeckLeftPadding],
238 Any(sal_Int32(2)));
239 setPropertyValue(

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

260 setPropertyValue(
261 maPropertyIdToNameMap[Int_DeckTitleBarHeight],
262 Any(sal_Int32(Alternatives(
263 26,
264 26,
265 rStyle.GetFloatTitleHeight()))));
266 setPropertyValue(
267 maPropertyIdToNameMap[Paint_PanelBackground],
266 Any(sal_Int32(rStyle.GetDialogColor().GetRGBColor())));
267 // Any(sal_Int32(mbIsHighContrastMode ? 0x000000 :
268 // 0xffffff)));
269
268 Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
269
270 setPropertyValue(
271 maPropertyIdToNameMap[Paint_PanelTitleBarBackground],
272 Any(Tools::VclToAwtGradient(Gradient(
273 GRADIENT_LINEAR,
274 aSecondColor.GetRGBColor(),
275 aBaseBackgroundColor.GetRGBColor()
276 ))));
277 setPropertyValue(

--- 897 unchanged lines hidden --- 		270 setPropertyValue(
271 maPropertyIdToNameMap[Paint_PanelTitleBarBackground],
272 Any(Tools::VclToAwtGradient(Gradient(
273 GRADIENT_LINEAR,
274 aSecondColor.GetRGBColor(),
275 aBaseBackgroundColor.GetRGBColor()
276 ))));
277 setPropertyValue(

--- 897 unchanged lines hidden ---