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

[escher/view] setFrame and layoutSubviews can be forced

Browse Source
This commit is contained in:
Léa Saviot
2019-10-02 11:22:49 +02:00
parent f85658f5e6
commit 9f018eb9d9
168 changed files with 421 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
escher/src/button_row_controller.cpp
View File

@@ -49,12 +49,12 @@ View * ButtonRowController::ContentView::subviewAtIndex(int index) {
}
}
void ButtonRowController::ContentView::layoutSubviews() {
void ButtonRowController::ContentView::layoutSubviews(bool force) {
/* Position the main view */
if (numberOfButtons() == 0) {
KDCoordinate margin = m_position == Position::Top ? 1 : 0;
KDRect mainViewFrame(0, margin, bounds().width(), bounds().height()-margin);
m_mainViewController->view()->setFrame(mainViewFrame);
m_mainViewController->view()->setFrame(mainViewFrame, force);
return;
}
KDCoordinate rowHeight;
@@ -65,7 +65,7 @@ void ButtonRowController::ContentView::layoutSubviews() {
}
KDCoordinate frameOrigin = m_position == Position::Top ? rowHeight+1 : 0;
KDRect mainViewFrame(0, frameOrigin, bounds().width(), bounds().height() - rowHeight - 1);
m_mainViewController->view()->setFrame(mainViewFrame);
m_mainViewController->view()->setFrame(mainViewFrame, force);
/* Position buttons */
int nbOfButtons = numberOfButtons();
@@ -88,7 +88,7 @@ void ButtonRowController::ContentView::layoutSubviews() {
Button * button = buttonAtIndex(i);
KDCoordinate buttonWidth = button->minimalSizeForOptimalDisplay().width();
KDRect buttonFrame(currentXOrigin, yOrigin, buttonWidth, buttonHeight);
button->setFrame(buttonFrame);
button->setFrame(buttonFrame, force);
currentXOrigin += buttonWidth + widthMargin;
}
}