aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2017-08-03 11:07:38 +0200
committerEugene Sandulenko2017-08-04 21:54:20 +0200
commit0be9566a5a82826199cbb283d3373680c7ead019 (patch)
tree97a261d96caca6ce730cf5c8f9373be40c13ddf7
parent49ad5ff0cf6f8c943914d22355facb1cfca1c59e (diff)
downloadscummvm-rg350-0be9566a5a82826199cbb283d3373680c7ead019.tar.gz
scummvm-rg350-0be9566a5a82826199cbb283d3373680c7ead019.tar.bz2
scummvm-rg350-0be9566a5a82826199cbb283d3373680c7ead019.zip
GRAPHICS: MACGUI: Simplified selection drawing code
-rw-r--r--graphics/macgui/mactextwindow.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 36c2bd6321..2194fddf36 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -155,16 +155,22 @@ void MacTextWindow::drawSelection() {
if (_selectedText.endY == -1)
return;
- int start = MIN(_selectedText.startY, _selectedText.endY);
- start -= _scrollPos;
+ SelectedText s = _selectedText;
+
+ if (s.startY > s.endY) {
+ SWAP(s.startX, s.endX);
+ SWAP(s.startY, s.endY);
+ SWAP(s.startRow, s.endRow);
+ SWAP(s.startCol, s.endCol);
+ }
+
+ int start = s.startY - _scrollPos;
start = MAX(0, start);
if (start > getInnerDimensions().height())
return;
- int end = MAX(_selectedText.startY, _selectedText.endY);
-
- end -= _scrollPos;
+ int end = s.endY - _scrollPos;
if (end < 0)
return;