mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS dba22b (1.57.114); FILE MERGED

Browse Source 
2006/12/09 18:56:42 fs 1.57.114.1: #i68720# KeyInput: for quick search, also select if newly selected entry is current entry (but not if it already is selected)
This commit is contained in:
Vladimir Glazounov
2007-01-15 13:38:40 +00:00
parent 5d317b6b97
commit d0b6f28e84
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vcl/source/control/ilstbox.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: ilstbox.cxx,v $ * $RCSfile: ilstbox.cxx,v $
* *
* $Revision: 1.57 $ * $Revision: 1.58 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 11:53:34 $ * last change: $Author: vg $ $Date: 2007-01-15 14:38:40 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -1577,7 +1577,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
else if( nSelect >= (mnTop + mnMaxVisibleEntries) ) else if( nSelect >= (mnTop + mnMaxVisibleEntries) )
SetTopEntry( nSelect - mnMaxVisibleEntries + 1 ); SetTopEntry( nSelect - mnMaxVisibleEntries + 1 );
if ( nSelect == mnCurrentPos ) if ( mpEntryList->IsEntryPosSelected( nSelect ) )
nSelect = LISTBOX_ENTRY_NOTFOUND; nSelect = LISTBOX_ENTRY_NOTFOUND;
maSearchTimeout.Start(); maSearchTimeout.Start();
@@ -1589,10 +1589,13 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
} }
} }
if ( (nSelect != LISTBOX_ENTRY_NOTFOUND) && if ( ( nSelect != LISTBOX_ENTRY_NOTFOUND )
((nSelect != mnCurrentPos ) || ( eLET == LET_KEYSPACE)) ) && ( ( !mpEntryList->IsEntryPosSelected( nSelect ) )
|| ( eLET == LET_KEYSPACE )
)
)
{ {
DBG_ASSERT( (nSelect != mnCurrentPos) || mbMulti, "ImplListBox: Selecting same Entry" ); DBG_ASSERT( !mpEntryList->IsEntryPosSelected( nSelect ) || mbMulti, "ImplListBox: Selecting same Entry" );
if( nSelect >= mpEntryList->GetEntryCount() ) if( nSelect >= mpEntryList->GetEntryCount() )
nSelect = mpEntryList->GetEntryCount()-1; nSelect = mpEntryList->GetEntryCount()-1;
mnCurrentPos = nSelect; mnCurrentPos = nSelect;