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

JANITORIAL: Improve readability of few calculations

Browse source
This commit is contained in:
av-dx 2021-07-25 21:15:47 +05:30 • committed by Eugene Sandulenko
parent 4f97262dd9
commit 444d16383d
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gui/widgets/groupedlist.cpp
View file

@ -30,7 +30,10 @@
#include "gui/gui-manager.h" #include "gui/gui-manager.h"
#include "gui/ThemeEval.h" #include "gui/ThemeEval.h"
#define kGroupTag -2 #define kGroupTag -2
#define isGroupHeader(x) (x <= kGroupTag)
#define indexToGroupID(x) (kGroupTag - x)
namespace GUI { namespace GUI {
@ -225,8 +228,8 @@ void GroupedListWidget::handleMouseDown(int x, int y, int button, int clickCount
abortEditMode(); abortEditMode();
_selectedItem = newSelectedItem; _selectedItem = newSelectedItem;
sendCommand(kListSelectionChangedCmd, _selectedItem); sendCommand(kListSelectionChangedCmd, _selectedItem);
} else if (_listIndex[newSelectedItem] <= kGroupTag) { } else if (isGroupHeader(_listIndex[newSelectedItem])) {
int groupID = -(_listIndex[newSelectedItem]) + kGroupTag; int groupID = indexToGroupID(_listIndex[newSelectedItem]);
_selectedItem = -1; _selectedItem = -1;
toggleGroup(groupID); toggleGroup(groupID);
warning("%d", groupID); warning("%d", groupID);
@ -332,7 +335,6 @@ void GroupedListWidget::drawWidget() {
for (i = 0, pos = _currentPos; i < _entriesPerPage && pos < len; i++, pos++) { for (i = 0, pos = _currentPos; i < _entriesPerPage && pos < len; i++, pos++) {
const int y = _y + _topPadding + kLineHeight * i; const int y = _y + _topPadding + kLineHeight * i;
const int fontHeight = kLineHeight; const int fontHeight = kLineHeight;
bool isGroupHeader = false;
ThemeEngine::TextInversionState inverted = ThemeEngine::kTextInversionNone; ThemeEngine::TextInversionState inverted = ThemeEngine::kTextInversionNone;
// Draw the selected item inverted, on a highlighted background. // Draw the selected item inverted, on a highlighted background.
@ -343,9 +345,8 @@ void GroupedListWidget::drawWidget() {
int pad = _leftPadding; int pad = _leftPadding;
int rtlPad = (_x + r.left + _leftPadding) - (_x + _hlLeftPadding); int rtlPad = (_x + r.left + _leftPadding) - (_x + _hlLeftPadding);
if (_listIndex[pos] <= kGroupTag) { if (isGroupHeader(_listIndex[pos])) {
int groupID = -_listIndex[pos] + kGroupTag; int groupID = indexToGroupID(_listIndex[pos]);
isGroupHeader = true;
r.left += fontHeight - 2 + _leftPadding; r.left += fontHeight - 2 + _leftPadding;
g_gui.theme()->drawFoldIndicator(Common::Rect(_x + _hlLeftPadding + _leftPadding, y, _x + fontHeight - 2 + _leftPadding, y + fontHeight - 2), _groupExpanded[groupID]); g_gui.theme()->drawFoldIndicator(Common::Rect(_x + _hlLeftPadding + _leftPadding, y, _x + fontHeight - 2 + _leftPadding, y + fontHeight - 2), _groupExpanded[groupID]);
pad = 0; pad = 0;
@ -387,7 +388,7 @@ void GroupedListWidget::drawWidget() {
} else { } else {
buffer = _list[pos]; buffer = _list[pos];
} }
if (isGroupHeader) if (isGroupHeader(_listIndex[pos]))
g_gui.theme()->drawText(r1, buffer, _state, g_gui.theme()->drawText(r1, buffer, _state,
_drawAlign, inverted, pad, true, ThemeEngine::kFontStyleBold, color); _drawAlign, inverted, pad, true, ThemeEngine::kFontStyleBold, color);
else else