mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move hMax correction from CComponentsItemBox to CComponentsTitleBar

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79c4ad05a2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-27 (Mon, 27 Aug 2012)

Origin message was:
------------------
* Move hMax correction from CComponentsItemBox to CComponentsTitleBar

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2012-08-27 03:18:04 +02:00
committed by Thilo Graf
parent ea539a4bbb
commit 0cf209f3ad
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/components/components.cpp
View File

@@ -994,8 +994,6 @@ void CComponentsItemBox::calculateElementsInitPart1()
if (v_element_data[i].type != CC_ITEMBOX_PICTURE) if (v_element_data[i].type != CC_ITEMBOX_PICTURE)
hMax = max(v_element_data[i].height, hMax); hMax = max(v_element_data[i].height, hMax);
} }
if (!has_TextElement)
hMax = max(font_text->getHeight(), hMax);
} }
void CComponentsItemBox::calculateElementsInitPart2() void CComponentsItemBox::calculateElementsInitPart2()
@@ -1157,6 +1155,10 @@ void CComponentsTitleBar::calculateElements()
calculateElementsInitPart1(); calculateElementsInitPart1();
// hMax correction if no text element.
if (!has_TextElement)
hMax = max(font_text->getHeight(), hMax);
// Calculate logo // Calculate logo
for (i = 0; i < v_element_data.size(); i++) { for (i = 0; i < v_element_data.size(); i++) {
if (v_element_data[i].type == CC_ITEMBOX_PICTURE) { if (v_element_data[i].type == CC_ITEMBOX_PICTURE) {