| DeckLayouter.cxx (d288180b) | DeckLayouter.cxx (b862c97c) |
|---|---|
| 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 --- 198 unchanged lines hidden (view full) --- 207 ::std::vector<sal_Int32> aSeparators; 208 const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight)); 209 const sal_Int32 nPanelTitleBarHeight (Theme::GetInteger(Theme::Int_PanelTitleBarHeight)); 210 sal_Int32 nY (0); 211 212 // Assign heights and places. 213 IterateLayoutItems(iItem,rLayoutItems) 214 { | 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 --- 198 unchanged lines hidden (view full) --- 207 ::std::vector<sal_Int32> aSeparators; 208 const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight)); 209 const sal_Int32 nPanelTitleBarHeight (Theme::GetInteger(Theme::Int_PanelTitleBarHeight)); 210 sal_Int32 nY (0); 211 212 // Assign heights and places. 213 IterateLayoutItems(iItem,rLayoutItems) 214 { |
| 215 if (iItem->mpPanel == NULL) | 215 if( !bool(iItem->mpPanel)) |
| 216 continue; 217 218 Panel& rPanel (*iItem->mpPanel); 219 220 // Separator above the panel title bar. 221 aSeparators.push_back(nY); 222 nY += nDeckSeparatorHeight; 223 --- 76 unchanged lines hidden (view full) --- 300 rAvailableHeight = rContentBox.GetHeight(); 301 302 const sal_Int32 nPanelTitleBarHeight (Theme::GetInteger(Theme::Int_PanelTitleBarHeight)); 303 const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight)); 304 305 IterateLayoutItems(iItem,rLayoutItems) 306 { 307 ui::LayoutSize aLayoutSize (ui::LayoutSize(0,0,0)); | 216 continue; 217 218 Panel& rPanel (*iItem->mpPanel); 219 220 // Separator above the panel title bar. 221 aSeparators.push_back(nY); 222 nY += nDeckSeparatorHeight; 223 --- 76 unchanged lines hidden (view full) --- 300 rAvailableHeight = rContentBox.GetHeight(); 301 302 const sal_Int32 nPanelTitleBarHeight (Theme::GetInteger(Theme::Int_PanelTitleBarHeight)); 303 const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight)); 304 305 IterateLayoutItems(iItem,rLayoutItems) 306 { 307 ui::LayoutSize aLayoutSize (ui::LayoutSize(0,0,0)); |
| 308 if (iItem->mpPanel != NULL) | 308 if( bool(iItem->mpPanel)) |
| 309 { 310 if (rLayoutItems.size() == 1 311 && iItem->mpPanel->IsTitleBarOptional()) 312 { 313 // There is only one panel and its title bar is 314 // optional => hide it. 315 rAvailableHeight -= nDeckSeparatorHeight; 316 iItem->mbShowTitleBar = false; --- 206 unchanged lines hidden --- | 309 { 310 if (rLayoutItems.size() == 1 311 && iItem->mpPanel->IsTitleBarOptional()) 312 { 313 // There is only one panel and its title bar is 314 // optional => hide it. 315 rAvailableHeight -= nDeckSeparatorHeight; 316 iItem->mbShowTitleBar = false; --- 206 unchanged lines hidden --- |