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 layoutSubview to avoid letting subviews overflow bounds()

Browse Source
This commit is contained in:
Émilie Feral
2019-12-26 14:30:05 +01:00
committed by Léa Saviot
parent 10c906e5e2
commit 2e3a904b9b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
escher/src/table_cell.cpp
View File

@@ -2,6 +2,8 @@
#include <escher/palette.h>
#include <escher/metric.h>
static inline KDCoordinate minCoordinate(KDCoordinate x, KDCoordinate y) { return x < y ? x : y; }
TableCell::TableCell(Layout layout) :
HighlightCell(),
m_layout(layout)
@@ -50,14 +52,14 @@ void TableCell::layoutSubviews(bool force) {
k_separatorThickness+k_labelMargin,
k_separatorThickness+Metric::TableCellLabelTopMargin,
width-2*k_separatorThickness-k_labelMargin,
labelSize.height()),
minCoordinate(labelSize.height(), height)),
force);
break;
default:
label->setFrame(KDRect(
k_separatorThickness+k_labelMargin,
k_separatorThickness,
labelSize.width(),
minCoordinate(labelSize.width(), width),
height - 2*k_separatorThickness),
force);
break;
@@ -90,7 +92,7 @@ void TableCell::layoutSubviews(bool force) {
accessory->setFrame(KDRect(
minX,
k_separatorThickness,
accessorySize.width(),
minCoordinate(accessorySize.width(), width - minX),
height-2*k_separatorThickness),
force);
}