diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2016-06-27 23:16:17 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2016-06-27 23:16:17 +0300 |
| commit | 3d7130be96c3bf8a84cd6092b1a26e055707d630 (patch) | |
| tree | 97ee34bf667ee3e63e5ac554d7c7dcdb64cc1a1a /main/src/addins/WindowsPlatform | |
| parent | c7606a74ffebf93da4967b053f154a37cf8a5ca7 (diff) | |
| parent | 8c955ef9100378f8d2a5d7a83031c93aa43dec35 (diff) | |
Merge remote-tracking branch 'origin/master' into run-configurations
Diffstat (limited to 'main/src/addins/WindowsPlatform')
| -rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs | 11 | ||||
| -rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs | 21 |
2 files changed, 19 insertions, 13 deletions
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs index 652b78d1fe..15cf7cac7d 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs @@ -22,7 +22,8 @@ using System.ComponentModel; using System.Runtime.CompilerServices;
using System.Windows.Media.Animation;
using MonoDevelop.Ide.Gui.Components;
-
+using System.Threading; + namespace WindowsPlatform.MainToolbar
{
public enum StatusBarStatus
@@ -305,8 +306,12 @@ namespace WindowsPlatform.MainToolbar {
get { return buildResultPanelVisibility; }
set { buildResultPanelVisibility = value; RaisePropertyChanged (); }
- }
-
+ } + + public void SetCancellationTokenSource (CancellationTokenSource source)
+ {
+ } + void RaisePropertyChanged ([CallerMemberName] string propName = null)
{
if (PropertyChanged != null)
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs index c579ab60f3..7730917f53 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs @@ -130,17 +130,18 @@ namespace WindowsPlatform.MainToolbar int count = 1;
int indexOfThis = parent.Items.IndexOf (this);
- foreach (var child in info.ArrayInfo) {
- Control toAdd;
- if (child.IsArraySeparator) {
- toAdd = new Separator ();
- } else {
- toAdd = new TitleMenuItem (manager, menuEntry, child, menu: menu);
+ if (info.ArrayInfo != null)
+ foreach (var child in info.ArrayInfo) {
+ Control toAdd;
+ if (child.IsArraySeparator) {
+ toAdd = new Separator ();
+ } else {
+ toAdd = new TitleMenuItem (manager, menuEntry, child, menu: menu);
+ }
+
+ toRemoveFromParent.Add (toAdd);
+ parent.Items.Insert (indexOfThis + (count++), toAdd);
}
-
- toRemoveFromParent.Add (toAdd);
- parent.Items.Insert (indexOfThis + (count++), toAdd);
- }
return;
}
}
|