Fix bad rulers display

LittleBigMouse_Control/MultiScreensViewModel.cs

@@ -65,6 +65,7 @@ private void BringSelectedToFront()
         [DependsOn(nameof(Config))]
         private void UpdateConfig()
         {
+            if (Config == null) return;
             AllScreens_CollectionChanged(Config.AllScreens, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add,Config.AllScreens));
             Config.AllScreens.CollectionChanged += AllScreens_CollectionChanged;
         }
@@ -94,8 +95,10 @@ private void AllScreens_CollectionChanged(object sender, NotifyCollectionChanged
 
 
         [DependsOn("Size", "Config.MovingPhysicalOutsideBounds")]
-        private void UpdateRatio(string s)
+        private void UpdateRatio()
         {
+            if (Config == null) return;
+
             Rect all = Config.MovingPhysicalOutsideBounds;
 
             double ratio = 0;

LittleBigMouse_Control/Plugins/Location/LocationControlViewModel.cs

@@ -24,10 +24,17 @@ public ScreenConfig Config
                     StartCommand = new StartCommand(Config);
                     StopCommand = new StopCommand(Config);
                     LittleBigMouseClient.Client.StateChanged += Client_StateChanged;
+
+                    View.Unloaded += View_Unloaded;
                 }
             }
         }
 
+        private void View_Unloaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            ShowRulers = false;
+        }
+
         private void Client_StateChanged()
         {
             Running = LittleBigMouseClient.Client.Running();

LittleBigMouse_Control/ScreenFrameView.xaml

@@ -174,6 +174,21 @@
                 <RowDefinition Height="{Binding Path=BottomBorder,FallbackValue=20}"/>
             </Grid.RowDefinitions>
 
+            <Grid Grid.Column="1" Grid.Row="1" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <!--<RowDefinition Height="2*"/>-->
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <ContentControl Grid.Column="1" Grid.Row="1" Content="{StaticResource LogoLbm}" Opacity="0.02" VerticalAlignment="Bottom">
+                    <ContentControl.Effect>
+                        <BlurEffect Radius="5"></BlurEffect>
+                    </ContentControl.Effect>
+                </ContentControl>
+            </Grid>
             <ContentControl Grid.Column="1" Grid.Row="1" Content="{Binding ControlViewModel.View}"/>
         </Grid>
     </Canvas>

LittleBigMouse_Control/ScreenFrameViewModel.cs

@@ -140,6 +140,8 @@ public double UnrotatedHeight
         [DependsOn("Screen", "Monitor.DisplayOrientation", "Width", "Height")]
         private void UpdateUnrotatedWidthHeight()
         {
+            if(Screen?.Monitor == null) return;
+
             if (Screen.Monitor.DisplayOrientation % 2 == 0)
             {
                 UnrotatedHeight = Height;
@@ -179,6 +181,8 @@ public GridLength UnrotatedLeftBorder
         [DependsOn(nameof(LeftBorder), nameof(TopBorder), nameof(RightBorder), nameof(BottomBorder))]
         private void UpdateUnrotated()
         {
+            if (Screen == null) return;
+
             GridLength[] unrotated = { TopBorder, RightBorder, BottomBorder, LeftBorder };
 
             int o = Screen.Monitor.DisplayOrientation;
@@ -211,6 +215,8 @@ public Transform ScreenOrientation
         [DependsOn("Monitor.DisplayOrientation", nameof(Width), nameof(Height))]
         public void UpddateScreenOrientation()
         {
+            if (Screen?.Monitor == null) return;
+
                 var t = new TransformGroup();
                 if (Screen.Monitor.DisplayOrientation > 0) t.Children.Add(new RotateTransform(90 * Screen.Monitor.DisplayOrientation));
 
@@ -238,9 +244,11 @@ public Viewbox Logo
             private set { SetProperty(ref _logo, value); }
         }
 
-        [DependsOn("Monitor.ManufacturerCode")]
+        [DependsOn("Screen", "Monitor.ManufacturerCode")]
         public void UpdateLogo()
         {
+            if (Screen?.Monitor == null) return;
+
                 switch (Screen.Monitor.ManufacturerCode.ToLower())
                 {
                     case "sam":

LittleBigMouse_Control/ScreenViewModel.cs

@@ -29,8 +29,11 @@ public Screen Screen
         [DependsOn("Screen")]
         private void WatchConfig()
         {
-            Watch(Screen.Config,"Config");
-            Watch(Screen.Monitor,"Monitor");
+            if (Screen?.Config != null)
+                Watch(Screen.Config,"Config");
+
+            if (Screen?.Monitor != null)
+                Watch(Screen.Monitor,"Monitor");
         }
 
 

LittleBigMouse_Control/setup/LittleBigMouse.iss

@@ -1,6 +1,6 @@
 ; -- LittleBigMouse.iss --
 ;#define AppVer GetFileVersion('..\bin\x64\Release\LittleBigMouse_Control.exe')
-#define AppVer '3.0-alpha4'
+#define AppVer '3.0-alpha7'
 
 [Setup]
 AppName=Little Big Mouse

NotifyChange/PropertyChangeHandler.cs

@@ -13,6 +13,11 @@ namespace NotifyChange
 {
     public class Notifier : DependencyObject, INotifyPropertyChanged
     {
+        public Notifier()
+        {
+            Init();
+        }
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
@@ -97,6 +102,36 @@ public bool SetAndWatch<T>(ref T storage, T value, [CallerMemberName] string pro
         //    return true;
         //}
 
+        private void Init()
+        {
+            Type t = GetType();
+            while (t != null)
+            {
+                MethodInfo[] m = t.GetMethods(
+                    BindingFlags.DeclaredOnly |
+                    BindingFlags.Instance | BindingFlags.Public
+                    | BindingFlags.NonPublic
+                    );
+                foreach (MethodInfo mi in m)
+                {
+                    if(mi.GetCustomAttributes(false).OfType<DependsOn>().Any())
+                    {
+                        if (mi.GetParameters().Length == 0)
+                        {
+                            mi.Invoke(this, null);
+
+                        }
+                        else
+                        {
+                            mi.Invoke(this, new object[] { "" });
+                        }
+                    }
+                }
+
+                t = t.BaseType;
+            }
+        }
+
         private void GetDependOn(string propertyName, ref List<string> list, ref List<MethodInfo> listMethods)
         {
             list.Add(propertyName);

ScreenConfig/AbsolutePoint.cs

@@ -85,8 +85,8 @@ public virtual WpfPoint Wpf
                             );
                     case NativeMethods.Process_DPI_Awareness.Process_System_DPI_Aware:
                         return new WpfPoint(Config, Screen,
-                            Pixel.X*Screen.PixelToWpfRatioX,
-                            Pixel.Y*Screen.PixelToWpfRatioY
+                            Pixel.X * Screen.PixelToWpfRatioX,
+                            Pixel.Y * Screen.PixelToWpfRatioY
                             );
                     default:
                         return new WpfPoint(Config, Screen,

ScreenConfig/Screen.cs

@@ -197,7 +197,7 @@ public bool SetPhysicalY(double value)
         [DependsOn("Monitor.DeviceCapsHorzSize")]
         public double RealPhysicalWidth
         {
-            get { return double.IsNaN(_realPhysicalWidth) ? Monitor.DeviceCapsHorzSize : _realPhysicalWidth; }
+            get { return double.IsNaN(_realPhysicalWidth) ? (Monitor?.DeviceCapsHorzSize??0) : _realPhysicalWidth; }
             set
             {
                 double ratio = value / RealPhysicalWidth;
@@ -257,6 +257,7 @@ private bool SetUnrotatedRealPhysicalHeight(double value)
         [DependsOn("Monitor.DeviceCapsHorzSize", "Monitor.DeviceCapsVertSize")]
         public void InitPhysicalSize()
         {
+            if (Monitor == null) return;
             if (double.IsNaN(_realPhysicalWidth)) SetRealPhysicalWidth(Monitor.DeviceCapsHorzSize);
             if (double.IsNaN(_realPhysicalHeight)) SetRealPhysicalHeight(Monitor.DeviceCapsVertSize);
         }
@@ -272,7 +273,7 @@ private bool SetRealPhysicalWidth(double value)
         [DependsOn("Monitor.DeviceCapsVertSize")]
         public double RealPhysicalHeight
         {
-            get { return double.IsNaN(_realPhysicalHeight) ? Monitor.DeviceCapsVertSize : _realPhysicalHeight; }
+            get { return double.IsNaN(_realPhysicalHeight) ? (Monitor?.DeviceCapsVertSize??0) : _realPhysicalHeight; }
             set
             {
                 double ratio = value / RealPhysicalHeight;
@@ -905,7 +906,7 @@ public double WpfToPixelRatioX
                     case NativeMethods.Process_DPI_Awareness.Process_System_DPI_Aware:
                         return Config.PrimaryScreen.EffectiveDpiX / 96;
                     case NativeMethods.Process_DPI_Awareness.Process_Per_Monitor_DPI_Aware:
-                        return Config.PrimaryScreen.EffectiveDpiX / 96;//EffectiveDpiX/96;
+                        return Config.MaxEffectiveDpiX / 96;
                     default:
                         throw new ArgumentOutOfRangeException();
                 }
@@ -924,7 +925,7 @@ public double WpfToPixelRatioY
                     case NativeMethods.Process_DPI_Awareness.Process_System_DPI_Aware:
                         return Config.PrimaryScreen.EffectiveDpiY / 96;
                     case NativeMethods.Process_DPI_Awareness.Process_Per_Monitor_DPI_Aware:
-                        return Config.PrimaryScreen.EffectiveDpiY / 96;
+                        return Config.MaxEffectiveDpiY / 96;
                     default:
                         throw new ArgumentOutOfRangeException();
                 }

ScreenConfig/ScreenConfig.cs

@@ -71,9 +71,11 @@ public static IEnumerable<string> ConfigsList
         }
 
         private static ObservableCollection<DisplayMonitor> Monitors => DisplayDevice.AttachedMonitors;
+
         public ScreenConfig()
         {
-            MonitorsOnCollectionChanged(Monitors,new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add,Monitors));
+            MonitorsOnCollectionChanged(Monitors,
+                new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, Monitors));
             Monitors.CollectionChanged += MonitorsOnCollectionChanged;
 
             Watch(AllScreens, "Screen");
@@ -115,7 +117,7 @@ public Screen Selected
         [DependsOn("Screen.Selected")]
         public void UpdateSelected()
         {
-            Selected  = AllScreens.FirstOrDefault ( screen => screen.Selected );
+            Selected = AllScreens.FirstOrDefault(screen => screen.Selected);
         }
 
         private static readonly string RootKey = @"SOFTWARE\Mgth\LittleBigMouse";
@@ -201,7 +203,8 @@ public static bool IsDoableConfig(String id)
             }
             return true;
         }
-        public static void AttachToDesktop(string configId, string monitorId, bool apply=true)
+
+        public static void AttachToDesktop(string configId, string monitorId, bool apply = true)
         {
             //using (RegistryKey monkey = Screen.OpenMonitorRegKey(monitorId))
             //{
@@ -220,11 +223,11 @@ public static void AttachToDesktop(string configId, string monitorId, bool apply
                 area.Height = double.Parse(monkey.GetValue("PixelHeight").ToString());
 
                 primary = double.Parse(monkey.GetValue("Primary").ToString()) == 1;
-                orientation = (int)double.Parse(monkey.GetValue("Orientation").ToString());
+                orientation = (int) double.Parse(monkey.GetValue("Orientation").ToString());
             }
 
             DisplayMonitor monitor = DisplayDevice.AllMonitors.FirstOrDefault(
-                                        d => monitorId == d.ManufacturerCode + d.ProductCode + "_" + d.Serial);
+                d => monitorId == d.ManufacturerCode + d.ProductCode + "_" + d.Serial);
 
             monitor?.AttachToDesktop(primary, area, orientation, apply);
         }
@@ -324,7 +327,7 @@ public Rect PhysicalOutsideBounds
             private set { if (SetProperty(ref _physicalOutsideBounds, value)) Saved = false; }
         }
 
-        [DependsOn(nameof(Moving),"Screen.PhysicalOutsideBounds")]
+        [DependsOn(nameof(Moving), "Screen.PhysicalOutsideBounds")]
         public void UpdatePhysicalOutsideBounds()
         {
             Rect outside = new Rect();
@@ -619,7 +622,7 @@ public void Compact()
                 _compacting = true;
             }
 
-            List<Screen> done = new List<Screen> { PrimaryScreen };
+            List<Screen> done = new List<Screen> {PrimaryScreen};
 
             List<Screen> todo = AllBut(PrimaryScreen).OrderBy(s => s.Distance(PrimaryScreen)).ToList();
 
@@ -670,5 +673,21 @@ public bool Saved
             get { return _saved; }
             set { SetProperty(ref _saved, value); }
         }
+
+        [DependsOn("Screen.EffectiveDpiX")]
+        public double MaxEffectiveDpiX {
+            get
+            {
+                return AllScreens.Select(screen => screen.EffectiveDpiX).Concat(new double[] {0}).Max();
+            }
+        }
+        [DependsOn("Screen.EffectiveDpiY")]
+        public double MaxEffectiveDpiY
+        {
+            get
+            {
+                return AllScreens.Select(screen => screen.EffectiveDpiY).Concat(new double[] { 0 }).Max();
+            }
+        }
     }
 }

WindowsMonitors/DisplayMonitor.cs

@@ -266,7 +266,7 @@ public void UpdateEdid()
         private void UpdateManufacturerCode()
         {
             String code;
-            if (Edid.Length < 10) code = "XXX";
+            if (Edid==null || Edid.Length < 10) code = "XXX";
             else
             {
                 code = "" + (char)(64 + ((Edid[8] >> 2) & 0x1F));
@@ -285,7 +285,7 @@ public String ProductCode
         [DependsOn(nameof(Edid))]
         private void UpdateProductCode()
         {
-            if (Edid.Length < 12) ProductCode = "0000";
+            if (Edid == null || Edid.Length < 12) ProductCode = "0000";
             else ProductCode = (Edid[10] + (Edid[11] << 8)).ToString("X4");
 
         }
@@ -299,7 +299,11 @@ public string Serial
         [DependsOn(nameof(Edid))]
         private void UpdateSerial()
         {
-            if (Edid.Length < 16) Serial = "00000000";
+            if (Edid == null || Edid.Length < 16)
+            {
+                Serial = "00000000";
+                return;
+            }
             string serial = "";
             for (int i = 12; i <= 15; i++) serial = (Edid[i]).ToString("X2") + serial;
             Serial = serial;
@@ -327,7 +331,7 @@ public string SerialNo
         [DependsOn(nameof(Edid))]
         private void UpdatePhysicalSize()
         {
-            if (Edid.Length > 68)
+            if (Edid != null && Edid.Length > 68)
             {
                 int w = ((Edid[68] & 0xF0) << 4) + Edid[66];
                 int h = ((Edid[68] & 0x0F) << 8) + Edid[67];
@@ -350,6 +354,8 @@ private void UpdatePhysicalSize()
 
         public string Block(char code)
         {
+            if (Edid == null) return "";
+
             for (int i = 54; i <= 108; i += 18)
             {
                 if (i < Edid.Length && Edid[i] == 0 && Edid[i + 1] == 0 && Edid[i + 2] == 0 && Edid[i + 3] == code)