Sfoglia il codice sorgente

打印机-打印开始后,禁止操作

ZhouJieSheng 1 anno fa
parent
commit
4fb40c4ddd

+ 7 - 6
PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -317,10 +317,12 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private List<Size> ItemSizes = new List<Size>() {
             new Size(104,142),
-            new Size(208, 294),
-            new Size(312,441)
+                new Size(208, 294),
+                new Size(312,441)
         };
 
+
+
         //选中的页面集合
         private List<int> selectedPageList = new List<int>();
 
@@ -2188,7 +2190,7 @@ namespace PDF_Master.ViewModels.PageEdit
             }
 
             //一个拿图比例系数,减少拿图耗时,尽量确保缩放后图片清晰度不会很差
-            int rate = (int)ItemSizes[2].Height;
+            int rate = (int)ItemSizes[2].Height*2;
 
             for (int i = startIndex; i <= endIndex; i++)
             {
@@ -2206,9 +2208,8 @@ namespace PDF_Master.ViewModels.PageEdit
                         }
                         else
                         {
-
                             //尺寸大小的图片 等比例放大  避免页面放大后内容模糊
-                            await PDFViewer.GetThumbnail(i, (int)PageEditItems[i].Size.Width*(rate/(int)PageEditItems[i].Size.Height), rate);
+                            await PDFViewer.GetThumbnail(i, (int)PageEditItems[i].Size.Width * (rate / (int)PageEditItems[i].Size.Height), rate);
                         }
                     }
                     else
@@ -2379,7 +2380,7 @@ namespace PDF_Master.ViewModels.PageEdit
                 if (PageEditItems.Count >= pageIndex + 1)
                 {
                     PixelFormat fmt = PixelFormats.Bgra32;
-                    BitmapSource bps = BitmapSource.Create(w, h, 96.0, 96.0, fmt, null, thumb, (w * fmt.BitsPerPixel + 7) / 8);
+                    BitmapSource bps = BitmapSource.Create(w, h,96.0, 96.0, fmt, null, thumb, (w * fmt.BitsPerPixel + 7) / 8);
                     PageEditItems[pageIndex].Image = bps;
                     PageEditItems[pageIndex].IsGetImage = true;
                 }

File diff suppressed because it is too large
+ 324 - 108
PDF Office/Views/Dialog/HomePageToolsDialogs/HomePagePrinter/HomePagePrinterDialog.xaml


+ 3 - 2
PDF Office/Views/PageEdit/PageEditContent.xaml

@@ -23,9 +23,9 @@
     prism:ViewModelLocator.AutoWireViewModel="True"
     FocusVisualStyle="{x:Null}"
     IsVisibleChanged="PageEdit_IsVisibleChanged"
+    Loaded="PageEdit_Loaded"
     SizeChanged="PageEdit_SizeChanged"
     Unloaded="PageEdit_Unloaded"
-    Loaded="PageEdit_Loaded"
     mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -49,7 +49,8 @@
                                 <Image
                                     RenderOptions.BitmapScalingMode="HighQuality"
                                     Source="{Binding Image}"
-                                    Stretch="Uniform" />
+                                    Stretch="Uniform"
+                                    UseLayoutRounding="True" />
                                 <Border
                                     Width="18"
                                     Height="20"