diff options
5 files changed, 27 insertions, 21 deletions
diff --git a/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs b/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs index 5695955be4..a8c17936d5 100644 --- a/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs +++ b/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs @@ -307,21 +307,25 @@ namespace MonoDevelop.MacIntegration.MainToolbar } } + NSImage projectImage = MultiResImage.CreateMultiResImage ("project", ""); + NSImage projectImageDisabled = MultiResImage.CreateMultiResImage ("project", "disabled"); + NSImage deviceImage = MultiResImage.CreateMultiResImage ("device", ""); + NSImage deviceImageDisabled = MultiResImage.CreateMultiResImage ("device", "disabled"); public PathSelectorView (CGRect frameRect) : base (frameRect) { Cells = new [] { new NSPathComponentCell { - Image = MultiResImage.CreateMultiResImage ("project", "disabled"), + Image = projectImageDisabled, Title = TextForActiveRunConfiguration, Enabled = false, }, new NSPathComponentCell { - Image = MultiResImage.CreateMultiResImage ("project", "disabled"), + Image = projectImageDisabled, Title = TextForActiveConfiguration, Enabled = false, }, new NSPathComponentCell { - Image = MultiResImage.CreateMultiResImage ("device", "disabled"), + Image = deviceImageDisabled, Title = TextForRuntimeConfiguration, Enabled = false, } @@ -516,18 +520,18 @@ namespace MonoDevelop.MacIntegration.MainToolbar void UpdateImages () { - string runStyle = ""; - string projectStyle = ""; - string deviceStyle = ""; + NSImage runConfigImage = projectImage; + NSImage configImage = projectImage; + NSImage runtimeImage = deviceImage; if (!Cells [RunConfigurationIdx].Enabled) - runStyle = "disabled"; - + runConfigImage = projectImageDisabled; + if (!Cells [ConfigurationIdx].Enabled) - projectStyle = "disabled"; + configImage = projectImageDisabled; if (!Cells [ConfigurationIdx].Enabled) - deviceStyle = "disabled"; + runtimeImage = deviceImageDisabled; // HACK // For some reason NSPathControl does not like the images that ImageService provides. To use them it requires @@ -535,9 +539,9 @@ namespace MonoDevelop.MacIntegration.MainToolbar // for its icons. It may be related to the images being initially loaded through the Gtk backend and then converted to NSImage // at a later date. // For whatever reason, we custom load the images here through NSImage, providing both 1x and 2x image reps. - Cells [RunConfigurationIdx].Image = MultiResImage.CreateMultiResImage ("project", runStyle); - Cells [ConfigurationIdx].Image = MultiResImage.CreateMultiResImage ("project", projectStyle); - Cells [RuntimeIdx].Image = MultiResImage.CreateMultiResImage ("device", deviceStyle); + Cells [RunConfigurationIdx].Image = runConfigImage; + Cells [ConfigurationIdx].Image = configImage;; + Cells [RuntimeIdx].Image = runtimeImage; RealignTexts (); } diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs index 81d408d7d1..55a49565a1 100644 --- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs @@ -564,12 +564,13 @@ namespace MonoDevelop.MacIntegration.MainToolbar RepositionContents (); } + NSImage statusReadyImage = ImageService.GetIcon (Stock.StatusSteady).ToNSImage (); void ReconstructString () { if (string.IsNullOrEmpty (text)) { textField.AttributedStringValue = new NSAttributedString (""); UpdateApplicationNamePlaceholderText (); - imageView.Image = ImageService.GetIcon (Stock.StatusSteady).ToNSImage (); + imageView.Image = statusReadyImage; } else { textField.AttributedStringValue = GetStatusString (text, textColor); imageView.Image = image; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs index 611c5ca12c..a7991b2ac0 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs @@ -198,10 +198,6 @@ namespace MonoDevelop.Projects.MSBuild EvaluateObjects (pi, context, objects, false); EvaluateObjects (pi, context, objects, true); - // Remove from the result all items that have an empty include. MSBuild never returns those. - - pi.EvaluatedItems.RemoveAll (it => it.Include.Length == 0); - // Once items have been evaluated, we need to re-evaluate properties that contain item transformations // (or that contain references to properties that have transformations). @@ -282,7 +278,11 @@ namespace MonoDevelop.Projects.MSBuild } static void AddItem (ProjectInfo project, MSBuildEvaluationContext context, MSBuildItem item, MSBuildItemEvaluated it, string include, Regex excludeRegex, bool trueCond) - { + {
+ // Don't add the result from any item that has an empty include. MSBuild never returns those.
+ if (include == string.Empty) + return; + if (include.Length > 3 && include [0] == '@' && include [1] == '(' && include [include.Length - 1] == ')') { // This is a transform List<MSBuildItemEvaluated> evalItems; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs index 889854ce72..34e780882d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs @@ -156,7 +156,8 @@ namespace MonoDevelop.Ide.TypeSystem if (statusIcon != null)
return;
statusIcon = IdeApp.Workbench?.StatusBar.ShowStatusIcon (ImageService.GetIcon ("md-parser"));
- statusIcon.ToolTip = GettextCatalog.GetString ("Gathering class information");
+ if (statusIcon != null)
+ statusIcon.ToolTip = GettextCatalog.GetString ("Gathering class information");
});
}
diff --git a/version-checks b/version-checks index dd809f665c..8b20bc2637 100755 --- a/version-checks +++ b/version-checks @@ -17,7 +17,7 @@ DEP[0]=md-addins DEP_NAME[0]=MDADDINS DEP_PATH[0]=${top_srcdir}/../md-addins DEP_MODULE[0]=git@github.com:xamarin/md-addins.git -DEP_NEEDED_VERSION[0]=36379e48bea13234171152dfc2e60aa753f41aac +DEP_NEEDED_VERSION[0]=882fd46329ad18d1ae69619ab0ab7692fd2826cf DEP_BRANCH_AND_REMOTE[0]="master origin/master" # heap-shot |