diff options
| author | Eugene Sandulenko | 2017-08-07 22:17:26 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-08-08 11:25:55 +0200 |
| commit | 0e2d14ac415faeec25226cef64b3443b0905eff9 (patch) | |
| tree | ed8e392683cda5e5bb02279dcdc09beb7b15290a /graphics/macgui/mactextwindow.cpp | |
| parent | aef786fcc3b93670ce980f37d44fea48955d9d3a (diff) | |
| download | scummvm-rg350-0e2d14ac415faeec25226cef64b3443b0905eff9.tar.gz scummvm-rg350-0e2d14ac415faeec25226cef64b3443b0905eff9.tar.bz2 scummvm-rg350-0e2d14ac415faeec25226cef64b3443b0905eff9.zip | |
GRAPHICS: MACGUI: Initial code for Cutting/Paste multiline input texts
Diffstat (limited to 'graphics/macgui/mactextwindow.cpp')
| -rw-r--r-- | graphics/macgui/mactextwindow.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp index 5bbd956d5f..5f3d01e25f 100644 --- a/graphics/macgui/mactextwindow.cpp +++ b/graphics/macgui/mactextwindow.cpp @@ -216,7 +216,7 @@ void MacTextWindow::drawSelection() { } } -Common::String MacTextWindow::getSelection(bool formatted) { +Common::String MacTextWindow::getSelection(bool formatted, bool newlines) { if (_selectedText.endY == -1) return Common::String(""); @@ -227,7 +227,7 @@ Common::String MacTextWindow::getSelection(bool formatted) { SWAP(s.startCol, s.endCol); } - return _mactext->getTextChunk(s.startRow, s.startCol, s.endRow, s.endCol, formatted); + return _mactext->getTextChunk(s.startRow, s.startCol, s.endRow, s.endCol, formatted, newlines); } void MacTextWindow::clearSelection() { @@ -324,7 +324,8 @@ bool MacTextWindow::processEvent(Common::Event &event) { bool cutAllowed = false; - if (_selectedText.startRow == _selectedText.endRow && _selectedText.startRow == _mactext->getLineCount() - 1) + if (_selectedText.startRow >= _mactext->getLineCount() - _inputTextHeight && + _selectedText.endRow >= _mactext->getLineCount() - _inputTextHeight) cutAllowed = true; _menu->enableCommand("Edit", "Cut", cutAllowed); |