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

[apps] Rename displayEmptyController -> displayEmptyControllerIfNeeded

Browse Source
This commit is contained in:
Léa Saviot
2020-04-30 15:20:31 +02:00
committed by Émilie Feral
parent e28f4ed7e2
commit 43d0ab5ea7
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/alternate_empty_nested_menu_controller.cpp
View File

@@ -7,7 +7,7 @@ void AlternateEmptyNestedMenuController::viewDidDisappear() {
NestedMenuController::viewDidDisappear();
}
bool AlternateEmptyNestedMenuController::displayEmptyController() {
bool AlternateEmptyNestedMenuController::displayEmptyControllerIfNeeded() {
assert(!isDisplayingEmptyController());
// If the content is empty, we push an empty controller.
if (numberOfRows() == 0) {

2
apps/alternate_empty_nested_menu_controller.h
View File

@@ -13,7 +13,7 @@ public:
protected:
virtual ViewController * emptyViewController() = 0;
virtual bool isDisplayingEmptyController() = 0;
bool displayEmptyController();
bool displayEmptyControllerIfNeeded();
};
#endif

2
apps/code/variable_box_controller.cpp
View File

@@ -62,7 +62,7 @@ void VariableBoxController::didEnterResponderChain(Responder * previousFirstResp
* when leaving the VariableBoxController, so we do not lose the environment
* that was loaded when entering the VariableBoxController. */
assert(App::app()->pythonIsInited());
displayEmptyController();
displayEmptyControllerIfNeeded();
}
KDCoordinate VariableBoxController::rowHeight(int j) {

4
apps/math_variable_box_controller.cpp
View File

@@ -62,7 +62,7 @@ bool MathVariableBoxController::handleEvent(Ion::Events::Event event) {
int newSelectedRow = rowIndex >= numberOfRows() ? numberOfRows()-1 : rowIndex;
selectCellAtLocation(selectedColumn(), newSelectedRow);
m_selectableTableView.reloadData();
displayEmptyController();
displayEmptyControllerIfNeeded();
return true;
}
return AlternateEmptyNestedMenuController::handleEvent(event);
@@ -160,7 +160,7 @@ bool MathVariableBoxController::selectSubMenu(int selectedRow) {
m_selectableTableView.deselectTable();
setPage(pageAtIndex(selectedRow));
bool selectSubMenu = AlternateEmptyNestedMenuController::selectSubMenu(selectedRow);
if (displayEmptyController()) {
if (displayEmptyControllerIfNeeded()) {
return true;
}
return selectSubMenu;