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

[escher/scroll_view] Fix virtuality issues of layoutSubviews

Browse Source 
Method contentSize() made virtual and overridden by ScrollableView
so that ScrollableView and TableView do not need to setSize themselves
and that setSize/setFrame is not called twice over m_contentView.
This commit is contained in:
Ruben Dashyan
2019-01-31 15:20:05 +01:00
committed by EmilieNumworks
parent c439d6f376
commit cda88b3c3b
6 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
escher/src/scrollable_view.cpp
View File

@@ -50,10 +50,9 @@ void ScrollableView::reloadScroll(bool forceReLayout) {
setContentOffset(m_manualScrollingOffset, forceReLayout);
}
void ScrollableView::layoutSubviews() {
KDSize viewSize = contentSize();
KDCoordinate viewWidth = max(viewSize.width(), bounds().width() - leftMargin() - rightMargin());
KDCoordinate viewHeight = max(viewSize.height(), bounds().height() - topMargin() - bottomMargin());
m_contentView->setSize(KDSize(viewWidth, viewHeight));
ScrollView::layoutSubviews();
KDSize ScrollableView::contentSize() const {
KDSize viewSize = ScrollView::contentSize();
KDCoordinate viewWidth = max(viewSize.width(), maxContentWidthDisplayableWithoutScrolling());
KDCoordinate viewHeight = max(viewSize.height(), maxContentHeightDisplayableWithoutScrolling());
return KDSize(viewWidth, viewHeight);
}