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

[apps/shared] Simplify BannerView methods

Browse Source
This commit is contained in:
Ruben Dashyan
2019-02-27 10:24:06 +01:00
committed by Émilie Feral
parent 4d640e2916
commit 26d59bbd74
1 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
apps/shared/banner_view.cpp
View File

@@ -1,5 +1,5 @@
#include "banner_view.h"
#include <string.h>
#include <assert.h>
namespace Shared {
@@ -12,61 +12,53 @@ KDSize BannerView::minimalSizeForOptimalDisplay() const {
}
void BannerView::layoutSubviews() {
assert(!m_frame.isEmpty());
/* We iterate on subviews, adding their width until we exceed the view bound.
* The last subview that exceeds the bound is recorded as the first subview of
* the next line. For the current line, we scan again the subviews and frame
* them by equally distributing the remaining width. We then jump to the next
* line and iterate the process. */
KDCoordinate totalWidth = bounds().width();
KDCoordinate lineWidth = 0;
View * textViewPreviousLine = subviewAtIndex(0);
const KDCoordinate lineWidth = m_frame.width();
KDCoordinate remainingWidth = lineWidth;
int indexOfFirstViewOfCurrentLine = 0;
KDCoordinate y = 0;
/* We do a last iteration of the loop to layout the last line. */
for (int i = 0; i <= numberOfSubviews(); i++) {
View * textView = nullptr;
KDCoordinate currentViewWidth = totalWidth;
if (i < numberOfSubviews()) {
textView = subviewAtIndex(i);
currentViewWidth = textView->minimalSizeForOptimalDisplay().width();
}
// The subview exceed the total width
if (lineWidth + currentViewWidth > totalWidth) {
KDCoordinate subviewWidth = (i < numberOfSubviews()) ? subviewAtIndex(i)->minimalSizeForOptimalDisplay().width() : lineWidth;
if (subviewWidth > remainingWidth) {
KDCoordinate x = 0;
int nbOfTextViewInLine = i > indexOfFirstViewOfCurrentLine ? i-indexOfFirstViewOfCurrentLine : 1;
KDCoordinate roundingError = totalWidth-lineWidth-nbOfTextViewInLine*(int)((totalWidth-lineWidth)/nbOfTextViewInLine);
int nbOfSubviewsOnLine = i > indexOfFirstViewOfCurrentLine ? i-indexOfFirstViewOfCurrentLine : 1;
KDCoordinate roundingError = remainingWidth % nbOfSubviewsOnLine;
View * subviewPreviousLine = nullptr;
for (int j = indexOfFirstViewOfCurrentLine; j < i; j++) {
textViewPreviousLine = subviewAtIndex(j);
KDCoordinate textWidth = textViewPreviousLine->minimalSizeForOptimalDisplay().width() + (totalWidth - lineWidth)/nbOfTextViewInLine;
// For the last text view, avoid letting a 1-pixel-wide empty vertical due to rounding error:
textWidth = j == i-1 ? textWidth + roundingError : textWidth;
KDCoordinate textHeight = textViewPreviousLine->minimalSizeForOptimalDisplay().height();
textViewPreviousLine->setFrame(KDRect(x, y, textWidth, textHeight));
x += textWidth;
subviewPreviousLine = subviewAtIndex(j);
KDCoordinate width = subviewPreviousLine->minimalSizeForOptimalDisplay().width() + remainingWidth/nbOfSubviewsOnLine + (j == i-1) * roundingError;
KDCoordinate height = subviewPreviousLine->minimalSizeForOptimalDisplay().height();
subviewPreviousLine->setFrame(KDRect(x, y, width, height));
x += width;
}
// Next line
y += textViewPreviousLine->minimalSizeForOptimalDisplay().height();
lineWidth = 0;
y += subviewPreviousLine->minimalSizeForOptimalDisplay().height();
remainingWidth = lineWidth;
indexOfFirstViewOfCurrentLine = i;
}
lineWidth += currentViewWidth;
remainingWidth -= subviewWidth;
}
}
int BannerView::numberOfLines() const {
KDCoordinate width = bounds().width();
KDCoordinate usedWidth = 0;
KDCoordinate lineNumber = 0;
int lineNumber = 1;
const KDCoordinate lineWidth = m_frame.width();
KDCoordinate remainingWidth = lineWidth;
for (int i = 0; i < numberOfSubviews(); i++) {
KDCoordinate textWidth = const_cast<Shared::BannerView *>(this)->subviewAtIndex(i)->minimalSizeForOptimalDisplay().width();
if (usedWidth+textWidth > width) {
usedWidth = textWidth;
KDCoordinate subviewWidth = const_cast<Shared::BannerView *>(this)->subviewAtIndex(i)->minimalSizeForOptimalDisplay().width();
if (subviewWidth > remainingWidth) {
remainingWidth = lineWidth;
lineNumber++;
} else {
usedWidth += textWidth;
}
remainingWidth -= subviewWidth;
}
return lineNumber+1;
return lineNumber;
}
}