Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a scrollview (with associated resizing trickery to cut-off the sides of the 

scrollbar) to the auto-complete list. This now also makes the scrollwheel work
but selection by mouse still needs implementing.

git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@561 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
leavengood 2010-12-29 21:00:13 +00:00 committed by Alexandre Deckner
parent 675a92e060
commit 36badc2d94
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/apps/webpositive/autocompletion/AutoCompleterDefaultImpl.cpp
View File

@ -10,6 +10,7 @@
#include <ListView.h> #include <ListView.h>
#include <Screen.h> #include <Screen.h>
#include <ScrollView.h>
#include <Window.h> #include <Window.h>
@ -324,7 +325,7 @@ BDefaultChoiceView::BDefaultChoiceView()
: :
fWindow(NULL), fWindow(NULL),
fListView(NULL), fListView(NULL),
fMaxVisibleChoices(5) fMaxVisibleChoices(8)
{ {
} }
@ -373,10 +374,12 @@ BDefaultChoiceView::ShowChoices(BAutoCompleter::CompletionStyle* completer)
); );
} }
BScrollView *scrollView = new BScrollView("", fListView, B_FOLLOW_NONE, 0, false, true, B_NO_BORDER);
fWindow = new BWindow(BRect(0, 0, 100, 100), "", B_BORDERED_WINDOW_LOOK, fWindow = new BWindow(BRect(0, 0, 100, 100), "", B_BORDERED_WINDOW_LOOK,
B_NORMAL_WINDOW_FEEL, B_NOT_MOVABLE | B_WILL_ACCEPT_FIRST_CLICK B_NORMAL_WINDOW_FEEL, B_NOT_MOVABLE | B_WILL_ACCEPT_FIRST_CLICK
| B_AVOID_FOCUS | B_ASYNCHRONOUS_CONTROLS); | B_AVOID_FOCUS | B_ASYNCHRONOUS_CONTROLS);
fWindow->AddChild(fListView); fWindow->AddChild(scrollView);
int32 visibleCount = min_c(count, fMaxVisibleChoices); int32 visibleCount = min_c(count, fMaxVisibleChoices);
float listHeight = fListView->ItemFrame(visibleCount - 1).bottom + 1; float listHeight = fListView->ItemFrame(visibleCount - 1).bottom + 1;
@ -390,8 +393,13 @@ BDefaultChoiceView::ShowChoices(BAutoCompleter::CompletionStyle* completer)
else else
listRect.OffsetTo(pvRect.left, pvRect.top - listHeight); listRect.OffsetTo(pvRect.left, pvRect.top - listHeight);
fListView->MoveTo(0, 0); // Moving here to cut off the scrollbar top
fListView->ResizeTo(listRect.Width(), listRect.Height()); scrollView->MoveTo(0, -1);
// Adding the 1 and 2 to cut-off the scroll-bar top, right and bottom
scrollView->ResizeTo(listRect.Width() + 1, listRect.Height() + 2);
// Move here to compensate for the above
fListView->MoveTo(0, 1);
fListView->ResizeTo(listRect.Width() - B_V_SCROLL_BAR_WIDTH, listRect.Height());
fWindow->MoveTo(listRect.left, listRect.top); fWindow->MoveTo(listRect.left, listRect.top);
fWindow->ResizeTo(listRect.Width(), listRect.Height()); fWindow->ResizeTo(listRect.Width(), listRect.Height());
fWindow->Show(); fWindow->Show();