소스 검색

编辑-文本编辑-将文本编辑的字体列表和其它模块区分开

lvle 1 년 전
부모
커밋
19fc5e42db
2개의 변경된 파일17개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 2
      PDF Office/Model/AnnotPanel/FontBoard.cs
  2. 15 1
      PDF Office/Model/PropertyPanel/AnnotPanel/FontStyleItem.cs

+ 2 - 2
PDF Office/Model/AnnotPanel/FontBoard.cs

@@ -189,7 +189,7 @@ namespace PDF_Master.Model.AnnotPanel
         //字体
         private void InitBase_FontFamilys()
         {
-            FontFamilyItems = TextFont.GetFamily();
+            FontFamilyItems = TextFont.GetFamilyEdit();
         }
 
         //字重
@@ -1086,7 +1086,7 @@ namespace PDF_Master.Model.AnnotPanel
 
         public void GetCurrentFontFamily(string fontFamily, string uiStr)
         {
-            if (fontFamily == "Arial")
+            if (fontFamily == "Helvetica")
             {
                 fontFamily = "Arial";
                 uiStr = "Arial";

+ 15 - 1
PDF Office/Model/PropertyPanel/AnnotPanel/FontStyleItem.cs

@@ -333,8 +333,22 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
             FontSizeItems.Add(item);
             return FontSizeItems;
         }
-
+
+
         public static List<ComboDataItem> GetFamily()
+        {
+            var FontFamilyItems = new List<ComboDataItem>();
+            ComboDataItem item = new ComboDataItem("Courier", "Courier New");
+            FontFamilyItems.Add(item);
+            item = new ComboDataItem("Arial", "Arial");
+            FontFamilyItems.Add(item);
+            item = new ComboDataItem(/*"Times-Roman"*/"Times", "Times New Roman");
+            FontFamilyItems.Add(item);
+            return FontFamilyItems;
+
+        }
+
+        public static List<ComboDataItem> GetFamilyEdit()
         {
             System.Drawing.Text.InstalledFontCollection objFont = new System.Drawing.Text.InstalledFontCollection();
             var FontFamilyItems = new List<ComboDataItem>();