thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Mark some fall-through cases as intentional

Browse source 
Comments explain how the num lock handling works before the
fall-through cases.
This commit is contained in:
Bastien Bouclet 2017-08-06 17:53:57 +02:00
parent 8e5ac98a4b
commit f5b335af10
4 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gui/ThemeEngine.cpp
View file

@ -630,6 +630,7 @@ void ThemeEngine::setGraphicsMode(GraphicsMode mode) {
_bytesPerPixel = sizeof(uint16);
break;
}
// fall through
default:
error("Invalid graphics mode");
}

9
gui/console.cpp
View file

@ -353,6 +353,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
defaultKeyDownHandler(state);
break;
}
// fall through
case Common::KEYCODE_DELETE:
if (_currentPos < _promptEndPos) {
killChar();
@ -365,6 +366,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
defaultKeyDownHandler(state);
break;
}
// fall through
case Common::KEYCODE_END:
if (state.hasFlags(Common::KBD_SHIFT)) {
_scrollLine = _promptEndPos / kCharsPerLine;
@ -382,6 +384,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
defaultKeyDownHandler(state);
break;
}
// fall through
case Common::KEYCODE_DOWN:
historyScroll(-1);
break;
@ -391,6 +394,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
defaultKeyDownHandler(state);
break;
}
// fall through
case Common::KEYCODE_PAGEDOWN:
if (state.hasFlags(Common::KBD_SHIFT)) {
_scrollLine += _linesPerPage - 1;
@ -409,6 +413,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
defaultKeyDownHandler(state);
break;
}
// fall through
case Common::KEYCODE_LEFT:
if (_currentPos > _promptStartPos)
_currentPos--;
@ -420,6 +425,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
defaultKeyDownHandler(state);
break;
}
// fall through
case Common::KEYCODE_RIGHT:
if (_currentPos < _promptEndPos)
_currentPos++;
@ -431,6 +437,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
defaultKeyDownHandler(state);
break;
}
// fall through
case Common::KEYCODE_HOME:
if (state.hasFlags(Common::KBD_SHIFT)) {
_scrollLine = _firstLineInBuffer + _linesPerPage - 1;
@ -446,6 +453,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
defaultKeyDownHandler(state);
break;
}
// fall through
case Common::KEYCODE_UP:
historyScroll(+1);
break;
@ -455,6 +463,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
defaultKeyDownHandler(state);
break;
}
// fall through
case Common::KEYCODE_PAGEUP:
if (state.hasFlags(Common::KBD_SHIFT)) {
_scrollLine -= _linesPerPage - 1;

7
gui/widgets/list.cpp
View file

@ -359,6 +359,7 @@ bool ListWidget::handleKeyDown(Common::KeyState state) {
handled = false;
break;
}
// fall through
case Common::KEYCODE_BACKSPACE:
case Common::KEYCODE_DELETE:
if (_selectedItem >= 0) {
@ -375,6 +376,7 @@ bool ListWidget::handleKeyDown(Common::KeyState state) {
handled = false;
break;
}
// fall through
case Common::KEYCODE_END:
_selectedItem = _list.size() - 1;
break;
@ -385,6 +387,7 @@ bool ListWidget::handleKeyDown(Common::KeyState state) {
handled = false;
break;
}
// fall through
case Common::KEYCODE_DOWN:
if (_selectedItem < (int)_list.size() - 1)
_selectedItem++;
@ -395,6 +398,7 @@ bool ListWidget::handleKeyDown(Common::KeyState state) {
handled = false;
break;
}
// fall through
case Common::KEYCODE_PAGEDOWN:
_selectedItem += _entriesPerPage - 1;
if (_selectedItem >= (int)_list.size() )
@ -406,6 +410,7 @@ bool ListWidget::handleKeyDown(Common::KeyState state) {
handled = false;
break;
}
// fall through
case Common::KEYCODE_HOME:
_selectedItem = 0;
break;
@ -415,6 +420,7 @@ bool ListWidget::handleKeyDown(Common::KeyState state) {
handled = false;
break;
}
// fall through
case Common::KEYCODE_UP:
if (_selectedItem > 0)
_selectedItem--;
@ -425,6 +431,7 @@ bool ListWidget::handleKeyDown(Common::KeyState state) {
handled = false;
break;
}
// fall through
case Common::KEYCODE_PAGEUP:
_selectedItem -= _entriesPerPage - 1;
if (_selectedItem < 0)

4
gui/widgets/popup.cpp
View file

@ -234,6 +234,7 @@ void PopUpDialog::handleKeyDown(Common::KeyState state) {
case Common::KEYCODE_KP1:
if (state.flags & Common::KBD_NUM)
break;
// fall through
case Common::KEYCODE_END:
setSelection(_popUpBoss->_entries.size()-1);
break;
@ -241,6 +242,7 @@ void PopUpDialog::handleKeyDown(Common::KeyState state) {
case Common::KEYCODE_KP2:
if (state.flags & Common::KBD_NUM)
break;
// fall through
case Common::KEYCODE_DOWN:
moveDown();
break;
@ -248,6 +250,7 @@ void PopUpDialog::handleKeyDown(Common::KeyState state) {
case Common::KEYCODE_KP7:
if (state.flags & Common::KBD_NUM)
break;
// fall through
case Common::KEYCODE_HOME:
setSelection(0);
break;
@ -255,6 +258,7 @@ void PopUpDialog::handleKeyDown(Common::KeyState state) {
case Common::KEYCODE_KP8:
if (state.flags & Common::KBD_NUM)
break;
// fall through
case Common::KEYCODE_UP:
moveUp();
break;