diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-23 17:26:31 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-23 17:53:12 +0200 |
| commit | ef9722558a33a6e88ed5ab76198f2698ddd1e003 (patch) | |
| tree | 97c2e3ac2f90a3f7e1edd24b1edc8f55aa34de79 /editeng | |
| parent | 658467304c40676dfd8a5d117f3b1866de40b959 (diff) | |
ImpEditView::SetEditSelection: fix missing tiled rendering selection callbacks
Commit 2f31ac76be64953d19a72e3d8eae42b1ac5c5473 (editeng tiled
rendering: allow resetting selection with a single click, 2015-03-16)
changed ImpEditView::DrawSelection() so that the selection is only
emitted when the view is in selection mode. However, this way selections
set by ImpEditEngine::Search() were lost, as it only set the selection, but not
the selection mode. So when in tiled rendering, always adjust selection
mode depending on if the selection is empty or not, that makes the
search result selections show up.
Change-Id: I00b0739c5263a98a437e38d01b73c5004e50957b
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 8866f994dd0a..118fc01d27d1 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -143,6 +143,10 @@ void ImpEditView::SetEditSelection( const EditSelection& rEditSelection ) // set state before notification aEditSelection = rEditSelection; + if (isTiledRendering()) + // Tiled rendering: selections are only painted when we are in selection mode. + pEditEngine->SetInSelectionMode(aEditSelection.HasRange()); + if ( pEditEngine->pImpEditEngine->GetNotifyHdl().IsSet() ) { const EditDoc& rDoc = pEditEngine->GetEditDoc(); |