i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* The InfoWindow's name text view is now using DisallowFilenameKeys() as well.

Browse Source 
* DisallowFilenameKeys() no longer forbids the ':', as there is no reason to do
  so.
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33894 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-11-05 12:37:43 +00:00
parent f4ee0103a2
commit a63c61839e
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/InfoWindow.cpp
+6 -3
View File
@@ -1853,16 +1853,19 @@ AttributeView::BeginEditingTitle()
fTitleEditView = new BTextView(textFrame, "text_editor", fTitleEditView = new BTextView(textFrame, "text_editor",
textRect, &font, 0, B_FOLLOW_ALL, B_WILL_DRAW); textRect, &font, 0, B_FOLLOW_ALL, B_WILL_DRAW);
fTitleEditView->SetText(fModel->Name()); fTitleEditView->SetText(fModel->Name());
DisallowFilenameKeys(fTitleEditView);
// Reset the width of the text rect // Reset the width of the text rect
textRect = fTitleEditView->TextRect(); textRect = fTitleEditView->TextRect();
textRect.right = fTitleEditView->LineWidth() + 20; textRect.right = fTitleEditView->LineWidth() + 20;
fTitleEditView->SetTextRect(textRect); fTitleEditView->SetTextRect(textRect);
fTitleEditView->SetWordWrap(false); fTitleEditView->SetWordWrap(false);
// Add filter for catching B_RETURN and B_ESCAPE key's // Add filter for catching B_RETURN and B_ESCAPE key's
fTitleEditView->AddFilter(new BMessageFilter(B_KEY_DOWN, AttributeView::TextViewFilter)); fTitleEditView->AddFilter(
new BMessageFilter(B_KEY_DOWN, AttributeView::TextViewFilter));
BScrollView *scrollView = new BScrollView("BorderView", BScrollView *scrollView = new BScrollView("BorderView", fTitleEditView,
fTitleEditView, 0, 0, false, false, B_PLAIN_BORDER); 0, 0, false, false, B_PLAIN_BORDER);
AddChild(scrollView); AddChild(scrollView);
fTitleEditView->SelectAll(); fTitleEditView->SelectAll();
fTitleEditView->MakeFocus(); fTitleEditView->MakeFocus();
src/kits/tracker/Utilities.cpp
-1
View File
@@ -139,7 +139,6 @@ ValidateStream(BMallocIO *stream, uint32 key, int32 version)
void void
DisallowFilenameKeys(BTextView *textView) DisallowFilenameKeys(BTextView *textView)
{ {
textView->DisallowChar(':');
textView->DisallowChar('/'); textView->DisallowChar('/');
} }