UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] TableCell: fix layoutSubviews

Browse Source
This commit is contained in:
Émilie Feral
2019-12-27 14:20:50 +01:00
committed by Léa Saviot
parent 816e17df66
commit d0e2e71e10
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
escher/src/table_cell.cpp
View File

@@ -48,21 +48,29 @@ void TableCell::layoutSubviews(bool force) {
if (label) {
switch (m_layout) {
case Layout::Vertical:
{
KDCoordinate x = k_separatorThickness+labelMargin();
KDCoordinate y = k_separatorThickness+Metric::TableCellLabelTopMargin;
label->setFrame(KDRect(
k_separatorThickness+labelMargin(),
k_separatorThickness+Metric::TableCellLabelTopMargin,
width-2*k_separatorThickness-labelMargin(),
minCoordinate(labelSize.height(), height)),
x,
y,
width-2*x,
minCoordinate(labelSize.height(), height-2*y)),
force);
break;
}
default:
{
KDCoordinate x = k_separatorThickness+labelMargin();
KDCoordinate y = k_separatorThickness;
label->setFrame(KDRect(
k_separatorThickness+labelMargin(),
x,
k_separatorThickness,
minCoordinate(labelSize.width(), width),
height - 2*k_separatorThickness),
minCoordinate(labelSize.width(), width-2*x),
height - 2*y),
force);
break;
}
}
}
View * accessory = accessoryView();
@@ -70,13 +78,16 @@ void TableCell::layoutSubviews(bool force) {
KDSize accessorySize = accessory->minimalSizeForOptimalDisplay();
switch (m_layout) {
case Layout::Vertical:
{
KDCoordinate x = k_separatorThickness+k_accessoryMargin;
accessory->setFrame(KDRect(
k_separatorThickness+k_accessoryMargin,
x,
height-k_separatorThickness-accessorySize.height()-k_accessoryBottomMargin,
width-2*k_separatorThickness - k_accessoryMargin,
width-2*x,
accessorySize.height()),
force);
break;
}
default:
// In some cases, the accessory view cannot take all the size it can
KDCoordinate wantedX = width-accessorySize.width()-k_separatorThickness-k_accessoryMargin;