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

Revert "Merge pull request #393 from RedGl0w/MenuFix"

Browse Source 
This reverts commit a9d75c6c7a, reversing
changes made to ebc9384131.
This commit is contained in:
Quentin Guidée
2020-08-06 15:23:08 +02:00
parent a9d75c6c7a
commit 4f30089d47
3 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/home/controller.cpp
View File

@@ -110,17 +110,6 @@ bool Controller::handleEvent(Ion::Events::Event event) {
return true;
}
if((numberOfIcons() % k_numberOfColumns)
&& event == Ion::Events::Down
&& selectionDataSource()->selectedRow() == numberOfRows() - 2
&& (numberOfIcons() % k_numberOfColumns) <= selectionDataSource()->selectedColumn()){
return m_view.selectableTableView()->selectCellAtLocation(numberOfIcons() % k_numberOfColumns - 1, numberOfRows()-1);
}
if(m_view.selectableTableView()->handleEvent(event, false)){
return true;
}
if (event == Ion::Events::Home || event == Ion::Events::Back) {
return m_view.selectableTableView()->selectCellAtLocation(0,0);
}
@@ -137,8 +126,9 @@ bool Controller::handleEvent(Ion::Events::Event event) {
void Controller::didBecomeFirstResponder() {
if (selectionDataSource()->selectedRow() == -1) {
m_view.selectableTableView()->selectCellAtLocation(0, 0, false);
selectionDataSource()->selectCellAtLocation(0, 0);
}
Container::activeApp()->setFirstResponder(m_view.selectableTableView());
}
void Controller::viewWillAppear() {

2
escher/include/escher/selectable_table_view.h
View File

@@ -25,7 +25,7 @@ public:
void selectRow(int j);
void selectColumn(int i);
void reloadData(bool setFirstResponder = true);
bool handleEvent(Ion::Events::Event event, bool setFirstResponder = true);
bool handleEvent(Ion::Events::Event event) override;
void didEnterResponderChain(Responder * previousFirstResponder) override;
void willExitResponderChain(Responder * nextFirstResponder) override;
void deselectTable(bool withinTemporarySelection = false);

18
escher/src/selectable_table_view.cpp
View File

@@ -132,30 +132,30 @@ HighlightCell * SelectableTableView::selectedCell() {
return cellAtLocation(selectedColumn(), selectedRow());
}
bool SelectableTableView::handleEvent(Ion::Events::Event event, bool setFirstResponder) {
bool SelectableTableView::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Down) {
return selectCellAtLocation(selectedColumn(), selectedRow()+1, setFirstResponder);
return selectCellAtLocation(selectedColumn(), selectedRow()+1);
}
if ((event == Ion::Events::ShiftDown || event == Ion::Events::AlphaDown) && selectedRow() < dataSource()->numberOfRows()-1) {
return selectCellAtLocation(selectedColumn(), dataSource()->numberOfRows()-1, setFirstResponder);
return selectCellAtLocation(selectedColumn(), dataSource()->numberOfRows()-1);
}
if (event == Ion::Events::Up) {
return selectCellAtLocation(selectedColumn(), selectedRow()-1, setFirstResponder);
return selectCellAtLocation(selectedColumn(), selectedRow()-1);
}
if ((event == Ion::Events::ShiftUp || event == Ion::Events::AlphaUp) && selectedRow() > 0) {
return selectCellAtLocation(selectedColumn(), 0, setFirstResponder);
return selectCellAtLocation(selectedColumn(), 0);
}
if (event == Ion::Events::Left) {
return selectCellAtLocation(selectedColumn()-1, selectedRow(), setFirstResponder);
return selectCellAtLocation(selectedColumn()-1, selectedRow());
}
if ((event == Ion::Events::ShiftLeft || event == Ion::Events::AlphaLeft) && selectedColumn() > 0) {
return selectCellAtLocation(0, selectedRow(), setFirstResponder);
return selectCellAtLocation(0, selectedRow());
}
if (event == Ion::Events::Right) {
return selectCellAtLocation(selectedColumn()+1, selectedRow(), setFirstResponder);
return selectCellAtLocation(selectedColumn()+1, selectedRow());
}
if ((event == Ion::Events::ShiftRight || event == Ion::Events::AlphaRight) && selectedColumn() < dataSource()->numberOfColumns()-1) {
return selectCellAtLocation(dataSource()->numberOfColumns()-1, selectedRow(), setFirstResponder);
return selectCellAtLocation(dataSource()->numberOfColumns()-1, selectedRow());
}
if (event == Ion::Events::Copy || event == Ion::Events::Cut) {
HighlightCell * cell = selectedCell();