[macdoc] Make code display the good bookmark item when one is used

1 files changed, 12 insertions, 2 deletions

diff --git a/MyDocument.cs b/MyDocument.cs
index b1099d2..871b5ae 100644
--- a/MyDocument.cs
+++ b/MyDocument.cs
@@ -26,6 +26,7 @@ namespace macdoc
 		Node match;
 		string currentUrl;
 		string currentTitle;
+		int currentBookmarkIndex;
 		
 		SearchableIndex searchIndex;
 		IndexSearcher mdocSearch;
@@ -133,6 +134,7 @@ namespace macdoc
 					break;
 				case BookmarkEventType.Added:
 					bookmarkSelector.AddItem (e.Entry.Name);
+					bookmarkSelector.SelectItem (e.Entry.Name);
 					break;
 				}
 			};
@@ -142,9 +144,10 @@ namespace macdoc
 			bookmarkSelector.Activated += (sender, e) => {
 				var bmarks = manager.GetAllBookmarks ();
 				var index = bookmarkSelector.IndexOfSelectedItem;
-				if (index >= 0 && index < bmarks.Count)
+				if (index >= 0 && index < bmarks.Count) {
+					currentBookmarkIndex = index;
 					LoadUrl (bmarks[index].Url, true);
-				bookmarkSelector.SelectItem (-1);
+				}
 			};
 			bookmarkSelector.SelectItem (-1);
 		}
@@ -206,6 +209,13 @@ namespace macdoc
 							tabSelector.SelectAt (0);
 							this.match = node;
 						}
+						// Bookmark spinner management
+						if (currentBookmarkIndex != -1) {
+							bookmarkSelector.SelectItem (currentBookmarkIndex);
+							currentBookmarkIndex = -1;
+						} else {
+						    bookmarkSelector.SelectItem (-1);
+						}
 					});
 				}
 			});