页面编辑-页面显示优化

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -2983,7 +2983,11 @@ namespace PDF_Master.ViewModels.PageEdit
                 PDFViewer.UndoManager.AddHistory(history);
             }
             //页面范围-横向页面，旋转90°后，输入框应当变成具体的页码,因为旋转后不是横向页面了（纵向页面同理）
-            ReloadAfterOption(true, false, Tuple.Create(items.Keys.First(), items.Keys.Last()));
+            if (items.Count > 0)
+            {
+                ReloadAfterOption(true, false, Tuple.Create(items.Keys.First(), items.Keys.Last()));
+            }
+
             IsLoading = Visibility.Collapsed;
         }
 
@@ -3247,13 +3251,13 @@ namespace PDF_Master.ViewModels.PageEdit
                         {
                             int index = Convert.ToInt32(PageEditItems[i].Size.Width / (PageEditItems[i].Size.Height / rate));
 
-                            SetThumbnailImage(i, index, rate);
+                            SetThumbnailImage(i, index, rate, true);
                         }
                         else
                         {
                             int index = Convert.ToInt32(PageEditItems[i].Size.Width * (rate / (int)PageEditItems[i].Size.Height));
                             //尺寸大小的图片 等比例放大  避免页面放大后内容模糊
-                            SetThumbnailImage(i, index, rate);
+                            SetThumbnailImage(i, index, rate, true);
                         }
                     }
                     else
@@ -3261,28 +3265,42 @@ namespace PDF_Master.ViewModels.PageEdit
                         if (PageEditItems[i].Size.Width > rate)
                         {
                             int index = Convert.ToInt32(PageEditItems[i].Size.Height / (PageEditItems[i].Size.Width / rate));
-                            SetThumbnailImage(i, index, rate);
+                            SetThumbnailImage(i, index, rate, false);
                         }
                         else
                         {
                             int index = Convert.ToInt32(PageEditItems[i].Size.Height * (rate / (int)(PageEditItems[i].Size.Width)));
-                            SetThumbnailImage(i, index, rate);
+                            SetThumbnailImage(i, index, rate, false);
                         }
                     }
                 }
             }
         }
 
-        private async void SetThumbnailImage(int i, int index, int rate)
+        private async void SetThumbnailImage(int i, int index, int rate, bool isVertical)
         {
             if (viewContentViewModel.IsHiddenAnnot)
             {
-                //显示=1, 隐藏=0注释
-                await PDFViewer.GetThumbnail(i, index, rate, 0);
+                if (isVertical)
+                {
+                    //显示=1, 隐藏=0注释
+                    await PDFViewer.GetThumbnail(i, index, rate, 0);
+                }
+                else
+                {
+                    await PDFViewer.GetThumbnail(i, rate, index, 0);
+                }
             }
             else
             {
-                await PDFViewer.GetThumbnail(i, index, rate, 1);
+                if (isVertical)
+                {
+                    await PDFViewer.GetThumbnail(i, index, rate, 1);
+                }
+                else
+                {
+                    await PDFViewer.GetThumbnail(i, rate, index, 1);
+                }
             }
         }