From f05dab29fd1f453bff08127cff6b6af85108ec17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 31 Mar 2009 12:51:50 +0000 Subject: [PATCH] * CharacterView now accepts mouse wheel input (it did not forward the messages to its superclass), and it also sets useful scroller steps. * Improved layout a bit. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29817 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/charactermap/CharacterView.cpp | 7 +++++-- src/apps/charactermap/CharacterWindow.cpp | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/apps/charactermap/CharacterView.cpp b/src/apps/charactermap/CharacterView.cpp index 3f80c65b78..b72136dc9c 100644 --- a/src/apps/charactermap/CharacterView.cpp +++ b/src/apps/charactermap/CharacterView.cpp @@ -166,6 +166,7 @@ CharacterView::MouseMoved(BPoint where, uint32 transit, void CharacterView::MessageReceived(BMessage* message) { + BView::MessageReceived(message); } @@ -303,10 +304,12 @@ CharacterView::_UpdateSize() } else { scroller->SetRange(0.0f, fDataRect.Height() - bounds.Height() - 1.0f); scroller->SetProportion(bounds.Height () / fDataRect.Height()); + scroller->SetSteps(fCharacterHeight, + Bounds().Height() - fCharacterHeight); + // scroll up if there is empty room on bottom - if (fDataRect.Height() < bounds.bottom) { + if (fDataRect.Height() < bounds.bottom) ScrollBy(0.0f, bounds.bottom - fDataRect.Height()); - } } Invalidate(); diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp index 5e97f09001..84740211c4 100644 --- a/src/apps/charactermap/CharacterWindow.cpp +++ b/src/apps/charactermap/CharacterWindow.cpp @@ -120,11 +120,12 @@ CharacterWindow::CharacterWindow() AddChild(BGroupLayoutBuilder(B_VERTICAL) .Add(menuBar) - .Add(BGroupLayoutBuilder()//BSplitLayoutBuilder() + .Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)//BSplitLayoutBuilder() .Add(unicodeScroller) - .Add(BGroupLayoutBuilder(B_VERTICAL) + .Add(BGroupLayoutBuilder(B_VERTICAL, 10) .Add(characterScroller) - .Add(fFontSizeSlider)))); + .Add(fFontSizeSlider)) + .SetInsets(10, 10, 10, 10))); // Add menu