[banshee] [Hyena.Gui] Fix grid scrolling via keyboard arrows
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] [Hyena.Gui] Fix grid scrolling via keyboard arrows
- Date: Mon, 15 Mar 2010 16:50:20 +0000 (UTC)
commit 63f648772662019532967cb15ed7880171d9050e
Author: Gabriel Burt <gabriel burt gmail com>
Date: Mon Mar 15 09:47:51 2010 -0700
[Hyena.Gui] Fix grid scrolling via keyboard arrows
Should also fix some other functions, like detecting if a given item is
visible.
.../ListView/ListView_Interaction.cs | 23 +++++++++++++-------
1 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs
index 1734250..f203a2a 100644
--- a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs
+++ b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs
@@ -146,8 +146,13 @@ namespace Hyena.Data.Gui
if (align_y) {
if (y_at_row < VadjustmentValue) {
ScrollToY (y_at_row);
- } else if (vadjustment != null && (y_at_row + ChildSize.Height) > (vadjustment.Value + vadjustment.PageSize)) {
- ScrollToY (y_at_row + ChildSize.Height - (vadjustment.PageSize));
+ } else if (vadjustment != null) {
+ var bottom_of_item = y_at_row + ChildSize.Height;
+ var bottom_of_view = vadjustment.Value + vadjustment.PageSize;
+ if (bottom_of_item > bottom_of_view) {
+ // Scroll down just enough to put the item fully into view
+ ScrollToY (bottom_of_item - (vadjustment.PageSize));
+ }
}
} else if (vadjustment != null) {
ScrollToY (vadjustment.Value + y_at_row - GetViewPointForModelRow (Selection.FocusedIndex).Y);
@@ -237,13 +242,13 @@ namespace Hyena.Data.Gui
case Gdk.Key.Home:
case Gdk.Key.KP_Home:
if (!HeaderFocused)
- handled = KeyboardScroll (press.State, -10000000, false);
+ handled = KeyboardScroll (press.State, -10000000, true);
break;
case Gdk.Key.End:
case Gdk.Key.KP_End:
if (!HeaderFocused)
- handled = KeyboardScroll (press.State, 10000000, false);
+ handled = KeyboardScroll (press.State, 10000000, true);
break;
case Gdk.Key.Return:
@@ -875,10 +880,12 @@ namespace Hyena.Data.Gui
{
// FIXME: hard-coded grid logic
if (ViewLayout != null) {
- var child = ViewLayout.FindChildAtModelRowIndex (row);
- return child == null
- ? new Gdk.Point (0, 0)
- : new Gdk.Point ((int)child.Allocation.X, (int)child.Allocation.Y);
+ int cols = ((DataViewLayoutGrid)ViewLayout).Columns;
+ if (cols == 0 || row == 0) {
+ return new Gdk.Point (0, 0);
+ } else {
+ return new Gdk.Point ((row % cols) * ChildSize.Width, (int)(Math.Floor ((double)row / (double)cols) * ChildSize.Height));
+ }
} else {
return new Gdk.Point (0, ChildSize.Height * row);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]