No need to lock out the normal typeahead when filtering doesn't apply (i.e. in
icon mode). And a little automatic whitespace cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35388 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
e33d4e74c2
commit
cc5b851813
@ -6107,8 +6107,10 @@ BPoseView::KeyDown(const char *bytes, int32 count)
|
|||||||
if (IsFilePanel())
|
if (IsFilePanel())
|
||||||
_inherited::KeyDown(bytes, count);
|
_inherited::KeyDown(bytes, count);
|
||||||
else {
|
else {
|
||||||
if (TrackerSettings().TypeAheadFiltering())
|
if (ViewMode() == kListMode
|
||||||
|
&& TrackerSettings().TypeAheadFiltering()) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (fSelectionList->IsEmpty())
|
if (fSelectionList->IsEmpty())
|
||||||
sMatchString.Truncate(0);
|
sMatchString.Truncate(0);
|
||||||
@ -6153,7 +6155,7 @@ BPoseView::KeyDown(const char *bytes, int32 count)
|
|||||||
|
|
||||||
case B_BACKSPACE:
|
case B_BACKSPACE:
|
||||||
{
|
{
|
||||||
if (TrackerSettings().TypeAheadFiltering()) {
|
if (fFiltering) {
|
||||||
BString *lastString = fFilterStrings.LastItem();
|
BString *lastString = fFilterStrings.LastItem();
|
||||||
if (lastString->Length() == 0) {
|
if (lastString->Length() == 0) {
|
||||||
int32 stringCount = fFilterStrings.CountItems();
|
int32 stringCount = fFilterStrings.CountItems();
|
||||||
@ -6193,7 +6195,8 @@ BPoseView::KeyDown(const char *bytes, int32 count)
|
|||||||
{
|
{
|
||||||
// handle typeahead selection / filtering
|
// handle typeahead selection / filtering
|
||||||
|
|
||||||
if (TrackerSettings().TypeAheadFiltering()) {
|
if (ViewMode() == kListMode
|
||||||
|
&& TrackerSettings().TypeAheadFiltering()) {
|
||||||
if (key == ' ' && modifiers() & B_SHIFT_KEY) {
|
if (key == ' ' && modifiers() & B_SHIFT_KEY) {
|
||||||
if (fFilterStrings.LastItem()->Length() == 0)
|
if (fFilterStrings.LastItem()->Length() == 0)
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user