Fixes #325 by checking access to the application main thread

fluentribbon · Jun 11, 2016 · 7785664 · 7785664
1 parent b96a9ea
commit 7785664
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -15,6 +15,7 @@
   - [#305](../../issues/305) - Combobox items will be drawn above each other on scroll down
   - [#311](../../issues/311) - State loading too verbose
   - [#315](../../issues/315) - Menu button gets blurry
+  - [#325](../../issues/325) - Running RibbonWindow not on the main thread.
 
 - ### Enhancements
   - [#279](../../issues/279) - Localization of ColorGallery

diff --git a/Fluent.Ribbon/Controls/RibbonTabItem.cs b/Fluent.Ribbon/Controls/RibbonTabItem.cs
@@ -718,7 +718,7 @@ public void OnKeyTipPressed()
             this.IsSelected = true;
 
             // This way keytips for delay loaded elements work correctly. Partially fixes #244.
-            Application.Current.Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Background, new Action(delegate { }));
+            this.Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Background, new Action(delegate { }));
         }
 
         /// <summary>

diff --git a/Fluent.Ribbon/Converters/IconConverter.cs b/Fluent.Ribbon/Converters/IconConverter.cs
@@ -22,7 +22,9 @@ object IValueConverter.Convert(object value, Type targetType, object parameter,
             if (value == null)
             {
                 if (Application.Current != null
-                    && Application.Current.MainWindow != null)
+                    && Application.Current.CheckAccess()
+                    && Application.Current.MainWindow != null
+                    && Application.Current.MainWindow.CheckAccess())
                 {
                     try
                     {

diff --git a/Fluent.Ribbon/Converters/ObjectToImageConverter.cs b/Fluent.Ribbon/Converters/ObjectToImageConverter.cs
@@ -90,9 +90,9 @@ private static Image CreateImage(string imagePath, double desiredSize)
                 && imagePath.EndsWith(".ico"))
             {
                 return new Image
-                    {
-                        Source = ExtractImageFromIcoFile(imagePath, desiredSize)
-                    };
+                {
+                    Source = ExtractImageFromIcoFile(imagePath, desiredSize)
+                };
             }
 
             return new Image
@@ -160,7 +160,10 @@ private static ImageSource ExtractImage(BitmapDecoder decoder, double desiredSiz
         {
             var dpiFactor = 1.0;
 
-            if (Application.Current.MainWindow != null)
+            if (Application.Current != null
+                && Application.Current.CheckAccess()
+                && Application.Current.MainWindow != null
+                && Application.Current.MainWindow.CheckAccess())
             {
                 // dpi.M11 = dpiX, dpi.M22 = dpiY
                 var presentationSource = PresentationSource.FromVisual(Application.Current.MainWindow);