Merge pull request #636 from cairoshell/task-thumb-pos

Author: josuave

Cairo Desktop/Cairo Desktop/DwmThumbnail.xaml.cs

@@ -29,7 +29,13 @@ public IntPtr Handle
         {
             get
             {
-                HwndSource source = (HwndSource)HwndSource.FromVisual(this);
+                HwndSource source = (HwndSource)PresentationSource.FromVisual(this);
+
+                if (source == null)
+                {
+                    return IntPtr.Zero;
+                }
+
                 IntPtr handle = source.Handle;
                 return handle;
             }
@@ -53,7 +59,7 @@ public IntPtr SourceWindowHandle
                 }
 
                 _sourceWindowHandle = value;
-                if (_sourceWindowHandle != IntPtr.Zero && NativeMethods.DwmRegisterThumbnail(Handle, _sourceWindowHandle, out _thumbHandle) == 0)
+                if (_sourceWindowHandle != IntPtr.Zero && Handle != IntPtr.Zero && NativeMethods.DwmRegisterThumbnail(Handle, _sourceWindowHandle, out _thumbHandle) == 0)
                     Refresh();
             }
         }

Cairo Desktop/Cairo Desktop/MenuBar.xaml.cs

@@ -3,7 +3,6 @@
 using CairoDesktop.Application.Structs;
 using CairoDesktop.Common;
 using CairoDesktop.Configuration;
-using CairoDesktop.Interop;
 using CairoDesktop.SupportingClasses;
 using ManagedShell;
 using System;
@@ -15,7 +14,6 @@
 using System.Windows.Input;
 using CairoDesktop.Infrastructure.ObjectModel;
 using CairoDesktop.Interfaces;
-using CairoDesktop.Services;
 using ManagedShell.AppBar;
 using ManagedShell.Common.Helpers;
 using ManagedShell.Common.Logging;

Cairo Desktop/Cairo Desktop/SupportingClasses/TaskThumbOrientationConverter.cs

@@ -1,5 +1,4 @@
-using CairoDesktop.Configuration;
-using System;
+using System;
 using System.Windows.Controls;
 using System.Windows.Data;
 
@@ -10,14 +9,12 @@ public class TaskThumbOrientationConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (Settings.Instance.EnableTaskbarThumbnails)
+            if (value is bool showThumbnails)
             {
-                return Orientation.Horizontal;
-            }
-            else
-            {
-                return Orientation.Vertical;
+                return showThumbnails ? Orientation.Horizontal : Orientation.Vertical;
             }
+
+            return Orientation.Horizontal;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)

Cairo Desktop/Cairo Desktop/TaskThumbWindow.xaml

@@ -13,6 +13,7 @@
         ResizeMode="NoResize"
         Background="Transparent"
         SourceInitialized="Window_SourceInitialized"
+        SizeChanged="ThumbWindow_SizeChanged"
         Closing="Window_Closing"
         MouseLeave="Window_MouseLeave"
         Topmost="True"
@@ -56,7 +57,7 @@
                 </ItemsControl.ItemTemplate>
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <StackPanel Orientation="{Binding Converter={StaticResource orientationConverter}}"></StackPanel>
+                        <StackPanel Orientation="{Binding ElementName=ThumbWindow, Path=ShowThumbnails, Converter={StaticResource orientationConverter}}"></StackPanel>
                     </ItemsPanelTemplate>
                 </ItemsControl.ItemsPanel>
             </ItemsControl>

Cairo Desktop/Cairo Desktop/TaskThumbWindow.xaml.cs

@@ -1,8 +1,12 @@
 using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
+using CairoDesktop.Configuration;
 using ManagedShell.Common.Helpers;
 using ManagedShell.Interop;
 
@@ -11,8 +15,28 @@ namespace CairoDesktop
     /// <summary>
     /// Interaction logic for TaskThumbWindow.xaml
     /// </summary>
-    public partial class TaskThumbWindow : Window
+    public partial class TaskThumbWindow : Window, INotifyPropertyChanged
     {
+        const int MAX_THUMBS = 5;
+
+        public bool ShowThumbnails
+        {
+            get
+            {
+                if (!IsDwmEnabled || !Settings.Instance.EnableTaskbarThumbnails)
+                {
+                    return false;
+                }
+
+                if (TaskButton != null && TaskButton.WindowGroup != null && TaskButton.WindowGroup.Count > MAX_THUMBS)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+
         internal TaskButton TaskButton;
         internal bool IsAnimating = true;
         internal bool IsDwmEnabled;
@@ -40,34 +64,76 @@ private void Window_SourceInitialized(object sender, EventArgs e)
             handle = helper.Handle;
             WindowHelper.HideWindowFromTasks(handle);
 
-            // get anchor point
-            Point taskButtonPoint = TaskButton.GetThumbnailAnchor();
-
-            if (Configuration.Settings.Instance.TaskbarPosition == 1)
+            if (Settings.Instance.TaskbarPosition == 1)
             {
                 // taskbar on top
-                Top = taskButtonPoint.Y + TaskButton.ActualHeight;
-
                 bdrThumb.Style = FindResource("TaskThumbWindowBorderTopStyle") as Style;
                 bdrThumbInner.Style = FindResource("TaskThumbWindowInnerBorderTopStyle") as Style;
 
                 bdrTranslate.Y *= -1;
 
                 ToolTipService.SetPlacement(this, System.Windows.Controls.Primitives.PlacementMode.Bottom);
             }
+
+            SetPosition();
+
+            if (TaskButton != null && TaskButton.WindowGroup != null)
+            {
+                ((INotifyCollectionChanged)TaskButton.WindowGroup).CollectionChanged += TaskThumbWindow_CollectionChanged;
+            }
+        }
+
+        private void TaskThumbWindow_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            OnPropertyChanged("ShowThumbnails");
+        }
+
+        private void SetPosition()
+        {
+            if (TaskButton == null || TaskButton.ParentTaskbar == null)
+            {
+                return;
+            }
+
+            Point taskButtonPoint = TaskButton.GetThumbnailAnchor();
+
+            if (Settings.Instance.TaskbarPosition == 1)
+            {
+                // taskbar on top
+                Top = taskButtonPoint.Y + TaskButton.ActualHeight;
+            }
             else
             {
                 Top = taskButtonPoint.Y - ActualHeight;
             }
 
-            Left = taskButtonPoint.X - ((ActualWidth - TaskButton.ActualWidth) / 2);
+            double desiredLeft = taskButtonPoint.X - ((ActualWidth - TaskButton.ActualWidth) / 2);
+
+            if (desiredLeft < 0)
+            {
+                Left = 0;
+            }
+            else if (desiredLeft + ActualWidth > TaskButton.ParentTaskbar.ActualWidth)
+            {
+                double bump = desiredLeft + ActualWidth - TaskButton.ParentTaskbar.ActualWidth;
+                Left = desiredLeft - bump;
+            }
+            else
+            {
+                Left = desiredLeft;
+            }
         }
 
-        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        private void Window_Closing(object sender, CancelEventArgs e)
         {
             isClosing = true;
             TaskButton.ThumbWindow = null;
             TaskButton.SetParentAutoHide(true);
+
+            if (TaskButton != null && TaskButton.WindowGroup != null)
+            {
+                ((INotifyCollectionChanged)TaskButton.WindowGroup).CollectionChanged -= TaskThumbWindow_CollectionChanged;
+            }
         }
 
         private void Window_MouseLeave(object sender, MouseEventArgs e)
@@ -80,5 +146,18 @@ private void Storyboard_Completed(object sender, EventArgs e)
         {
             IsAnimating = false;
         }
+
+        #region INotifyPropertyChanged
+        public event PropertyChangedEventHandler PropertyChanged;
+        private void OnPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+        #endregion
+
+        private void ThumbWindow_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            SetPosition();
+        }
     }
 }

Cairo Desktop/Cairo Desktop/TaskThumbnail.xaml

@@ -54,8 +54,7 @@
             MouseUp="bdrThumbInner_MouseUp">
         <StackPanel>
             <StackPanel Name="pnlTitle"
-                        Orientation="Horizontal"
-                        Margin="0,0,0,5">
+                        Orientation="Horizontal">
                 <Image Source="{Binding Path=Icon, Mode=OneWay, FallbackValue={StaticResource NullIcon}, TargetNullValue={StaticResource NullIcon}}"
                         Width="16"
                         Height="16" />
@@ -74,7 +73,8 @@
             </StackPanel>
             <local:DwmThumbnail x:Name="dwmThumbnail"
                                 Width="180"
-                                Height="120" />
+                                Height="120"
+                                Margin="0,5,0,0" />
         </StackPanel>
     </Border>
 </UserControl>

Cairo Desktop/Cairo Desktop/TaskThumbnail.xaml.cs

@@ -34,37 +34,68 @@ public TaskThumbnail()
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-            if (_isLoaded)
+            if (_isLoaded || ThumbWindow == null || ThumbWindow.TaskButton == null || ThumbWindow.TaskButton.ParentTaskbar == null)
             {
                 return;
             }
 
             _window = DataContext as ApplicationWindow;
+            _taskbarHwnd = ThumbWindow.TaskButton.ParentTaskbar.Handle;
 
-            // if DWM or thumbnails disabled, hide the thumbnail placeholder
-            if (!ThumbWindow.IsDwmEnabled || !Settings.Instance.EnableTaskbarThumbnails)
+            SetupThumbnail();
+
+            ThumbWindow.PropertyChanged += ThumbWindow_PropertyChanged;
+
+            _isLoaded = true;
+        }
+
+        private void SetupThumbnail()
+        {
+            if (!ThumbWindow.ShowThumbnails)
             {
-                dwmThumbnail.Visibility = Visibility.Collapsed;
-                pnlTitle.Margin = new Thickness(0);
+                DisableThumbnail();
             }
             else
             {
-                if (ThumbWindow.TaskButton.ParentTaskbar == null)
-                {
-                    return;
-                }
-                _taskbarHwnd = ThumbWindow.TaskButton.ParentTaskbar.Handle;
+                EnableThumbnail();
+            }
+        }
 
-                // set up thumbnail
-                dwmThumbnail.DpiScale = ThumbWindow.TaskButton.ParentTaskbar.DpiScale;
-                dwmThumbnail.ThumbnailOpacity = 0;
-                dwmThumbnail.SourceWindowHandle = _window.Handle;
+        private void EnableThumbnail()
+        {
+            // show thumbnail placeholder
+            dwmThumbnail.Visibility = Visibility.Visible;
+
+            if (ThumbWindow == null || ThumbWindow.TaskButton == null || ThumbWindow.TaskButton.ParentTaskbar == null)
+            {
+                return;
+            }
+
+            // set up thumbnail
+            dwmThumbnail.DpiScale = ThumbWindow.TaskButton.ParentTaskbar.DpiScale;
+            dwmThumbnail.SourceWindowHandle = _window.Handle;
 
+            if (ThumbWindow.IsAnimating)
+            {
                 // set up animation
+                dwmThumbnail.ThumbnailOpacity = 0;
                 CompositionTarget.Rendering += CompositionTarget_Rendering;
             }
+            else
+            {
+                dwmThumbnail.ThumbnailOpacity = 255;
+            }
+        }
 
-            _isLoaded = true;
+        private void DisableThumbnail()
+        {
+            // hide the thumbnail placeholder if thumbnails are not being used
+            dwmThumbnail.Visibility = Visibility.Collapsed;
+        }
+
+        private void ThumbWindow_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            SetupThumbnail();
         }
 
         private void UserControl_Unloaded(object sender, RoutedEventArgs e)
@@ -74,10 +105,16 @@ private void UserControl_Unloaded(object sender, RoutedEventArgs e)
                 return;
             }
 
-            if (ThumbWindow.IsDwmEnabled)
+            if (ThumbWindow != null)
             {
-                dwmThumbnail.SourceWindowHandle = IntPtr.Zero;
+                if (ThumbWindow.IsDwmEnabled)
+                {
+                    dwmThumbnail.SourceWindowHandle = IntPtr.Zero;
+                }
+
+                ThumbWindow.PropertyChanged -= ThumbWindow_PropertyChanged;
             }
+
             _isLoaded = false;
         }
 

Cairo Desktop/Cairo Desktop/Taskbar.xaml.cs

@@ -313,6 +313,7 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
                     break;
                 case "TaskbarGroupingStyle":
                     _shellManager.Tasks.SetTaskCategoryProvider(getTaskCategoryProvider());
+                    setTaskButtonSize();
                     break;
             }
         }
@@ -336,7 +337,7 @@ private void setTaskButtonSize()
             if (TasksList.Items.Groups != null)
             {
                 // calculate the maximum per-button size
-                double adjustedSize = Math.Floor((ActualWidth - quickLaunchList.ActualWidth - (btnDesktopOverlay.ActualWidth - 5) - btnTaskList.ActualWidth - (TasksList.Items.Groups.Count * 4 - 3) - 11) / TasksList.Items.Count);
+                double adjustedSize = Math.Floor((ActualWidth - quickLaunchList.ActualWidth - (btnDesktopOverlay.ActualWidth - 5) - btnTaskList.ActualWidth - (TasksList.Items.Groups.Count * 4 - 3) - 11) / (Settings.Instance.TaskbarGroupingStyle == 2 ? TasksList.Items.Groups.Count : TasksList.Items.Count));
 
                 if (adjustedSize > baseButtonWidth)
                 {