UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] Fix accessory view that should not hide main view in some cases

Browse Source
This commit is contained in:
Léa Saviot
2018-11-13 11:38:32 +01:00
committed by Émilie Feral
parent 056c78408d
commit e86300a28d
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
escher/src/table_cell.cpp
View File

@@ -38,14 +38,22 @@ void TableCell::layoutSubviews() {
KDCoordinate width = bounds().width();
KDCoordinate height = bounds().height();
View * label = labelView();
KDSize labelSize = label ? label->minimalSizeForOptimalDisplay() : KDSizeZero;
if (label) {
KDSize labelSize = label->minimalSizeForOptimalDisplay();
switch (m_layout) {
case Layout::Vertical:
label->setFrame(KDRect(k_separatorThickness+k_labelMargin, k_separatorThickness+Metric::TableCellLabelTopMargin, width-2*k_separatorThickness-k_labelMargin, labelSize.height()));
label->setFrame(KDRect(
k_separatorThickness+k_labelMargin,
k_separatorThickness+Metric::TableCellLabelTopMargin,
width-2*k_separatorThickness-k_labelMargin,
labelSize.height()));
break;
default:
label->setFrame(KDRect(k_separatorThickness+k_labelMargin, k_separatorThickness, labelSize.width(), height - 2*k_separatorThickness));
label->setFrame(KDRect(
k_separatorThickness+k_labelMargin,
k_separatorThickness,
labelSize.width(),
height - 2*k_separatorThickness));
break;
}
}
@@ -54,12 +62,29 @@ void TableCell::layoutSubviews() {
KDSize accessorySize = accessory->minimalSizeForOptimalDisplay();
switch (m_layout) {
case Layout::Vertical:
accessory->setFrame(KDRect(k_separatorThickness+k_accessoryMargin, height-k_separatorThickness-accessorySize.height()-k_accessoryBottomMargin,
width-2*k_separatorThickness - k_accessoryMargin, accessorySize.height()));
accessory->setFrame(KDRect(
k_separatorThickness+k_accessoryMargin,
height-k_separatorThickness-accessorySize.height()-k_accessoryBottomMargin,
width-2*k_separatorThickness - k_accessoryMargin,
accessorySize.height()));
break;
default:
accessory->setFrame(KDRect(width - accessorySize.width() - k_separatorThickness-k_accessoryMargin, k_separatorThickness,
accessorySize.width(), height-2*k_separatorThickness));
// In some cases, the accessory view cannot take all the size it can
KDCoordinate wantedX = width-accessorySize.width()-k_separatorThickness-k_accessoryMargin;
KDCoordinate minX = label ? label->bounds().x()+labelSize.width()+k_labelMargin+k_separatorThickness+k_accessoryMargin : k_accessoryMargin;
if (minX < wantedX) {
accessory->setFrame(KDRect(
wantedX,
k_separatorThickness,
accessorySize.width(),
height-2*k_separatorThickness));
} else {
accessory->setFrame(KDRect(
minX,
k_separatorThickness,
accessorySize.width(),
height-2*k_separatorThickness));
}
break;
}
}