Browse Source

'修复在高分屏下弹窗确认界面跑出可视区域外的bug'

anycmd 4 years ago
parent
commit
3ac2735be5
2 changed files with 7 additions and 4 deletions
  1. 1 4
      src/AppModels/Vms/CoinViewModel.cs
  2. 6 0
      src/NTMinerWpf/WindowExtension.cs

+ 1 - 4
src/AppModels/Vms/CoinViewModel.cs

@@ -119,10 +119,7 @@ namespace NTMiner.Vms {
         }
         }
 
 
         private void ApplyOverClock() {
         private void ApplyOverClock() {
-            Task.Factory.StartNew(() => {
-                // 比较耗时,防止界面卡
-                VirtualRoot.Execute(new CoinOverClockCommand(this.Id));
-            });
+            VirtualRoot.Execute(new CoinOverClockCommand(this.Id));
         }
         }
 
 
         private void FillOverClock(OverClockDataViewModel data) {
         private void FillOverClock(OverClockDataViewModel data) {

+ 6 - 0
src/NTMinerWpf/WindowExtension.cs

@@ -37,6 +37,12 @@ namespace NTMiner {
                 if (over > 0) {
                 if (over > 0) {
                     left -= over;
                     left -= over;
                 }
                 }
+                if (top > SystemParameters.WorkArea.Height) {
+                    top = SystemParameters.WorkArea.Height - height;
+                }
+                if (left > SystemParameters.WorkArea.Width) {
+                    left = SystemParameters.WorkArea.Width - width;
+                }
                 window.Left = left;
                 window.Left = left;
                 window.Top = top;
                 window.Top = top;
             }
             }