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

[escher] Implement ScrollView::minimalSizeForOptimalDisplay including margins

Browse Source 
Remove from derived classes:
 - apps/calculation/scrollable_expression_view
 - apps/code/consol_line_cell
 - apps/shared/scrollable_exact_approximate_expressions_view
 - escher/layout_field
 - escher/table_view
 - escher/text_field
This commit is contained in:
Ruben Dashyan
2019-02-05 16:13:00 +01:00
committed by EmilieNumworks
parent 0e0b49acce
commit 08e8bf0eeb
15 changed files with 16 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
escher/src/scroll_view.cpp
View File

@@ -24,6 +24,14 @@ ScrollView::ScrollView(View * contentView, ScrollViewDataSource * dataSource) :
assert(m_dataSource != nullptr);
}
KDSize ScrollView::minimalSizeForOptimalDisplay() const {
KDSize contentSize = m_contentView->minimalSizeForOptimalDisplay();
return KDSize(
contentSize.width() + m_leftMargin + m_rightMargin,
contentSize.height() + m_topMargin + m_bottomMargin
);
}
void ScrollView::setCommonMargins() {
setTopMargin(Metric::CommonTopMargin);
setRightMargin(Metric::CommonRightMargin);
@@ -68,8 +76,8 @@ void ScrollView::scrollToContentPoint(KDPoint p, bool allowOverscroll) {
/* Handle cases when the size of the view has decreased. */
setContentOffset(KDPoint(
min(contentOffset().x(), max(contentSize().width() - maxContentWidthDisplayableWithoutScrolling(), 0)),
min(contentOffset().y(), max(contentSize().height() - maxContentHeightDisplayableWithoutScrolling(), 0))
min(contentOffset().x(), max(minimalSizeForOptimalDisplay().width() - bounds().width(), 0)),
min(contentOffset().y(), max(minimalSizeForOptimalDisplay().height() - bounds().height(), 0))
));
}
@@ -92,11 +100,7 @@ void ScrollView::layoutSubviews() {
KDPoint absoluteOffset = contentOffset().opposite().translatedBy(KDPoint(m_leftMargin, m_topMargin));
KDRect contentFrame = KDRect(absoluteOffset, contentSize());
m_contentView->setFrame(contentFrame);
KDSize content(
m_contentView->bounds().width() + m_leftMargin + m_rightMargin,
m_contentView->bounds().height() + m_topMargin + m_bottomMargin
);
decorator()->layoutIndicators(content, contentOffset(), m_frame.size());
decorator()->layoutIndicators(minimalSizeForOptimalDisplay(), contentOffset(), m_frame.size());
}
void ScrollView::setContentOffset(KDPoint offset, bool forceRelayout) {