프로젝트

일반

사용자정보

개정판 4fcb686a

ID4fcb686a2d4740f5eee8d44f69429ab17bd7489f
상위 a7bee7cf
하위 5ba8f2d5

김태성이(가) 2년 이상 전에 추가함

issue #000 font가 적용 되지 않아 box size가 작게 출력되는 문제

Change-Id: Ie07531db96d56e8d5c2bbdbf0786d053ad39747c

차이점 보기:

KCOM/Events/Implementation/TopMenuEvent.cs
1272 1272
        }
1273 1273

  
1274 1274
        //강인구 추가
1275
        private void RadRibbonComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
1275
        private void comboFontFamily_SelectionChanged(object sender, SelectionChangedEventArgs e)
1276 1276
        {
1277
            if (comboFontFamily.SelectedItem != null)
1277
            
1278
            if (comboFontFamily.SelectedItem != null && !IsSuspendChange)
1278 1279
            {
1280
                var main = this.ParentOfType<MainWindow>()?.dzMainMenu;
1279 1281
                var font = comboFontFamily.SelectedItem as Markus.Fonts.MarkusFont;
1282
                var lstTextCtrl = SelectTextControl();
1280 1283

  
1281
                if (this.ParentOfType<MainWindow>()?.dzMainMenu.SelectLayer.Children.Count > 0)
1284
                foreach (var item in lstTextCtrl)
1282 1285
                {
1283
                    foreach (var item in this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children)
1286
                    if (item is MarkupToPDF.Controls.Text.ArrowTextControl ctrl1)
1284 1287
                    {
1285
                        if (item.GetType().Name == "AdornerFinal")
1286
                        {
1287
                            var adnoerFinal = (item as Controls.AdornerFinal);
1288

  
1289
                            var adornerMembers = adnoerFinal.Members.Cast<Controls.AdornerMember>();
1290

  
1291
                            foreach (var InnerItem in adornerMembers)
1292
                            {
1293
                                switch (InnerItem.DrawingData.GetType().Name)
1294
                                {
1295
                                    case ("TextControl"):
1296
                                        (InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).SetFontFamily(font.FontFamily);
1297
                                        break;
1298
                                    case ("ArrowTextControl"):
1299
                                        (InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).SetFontFamily(font.FontFamily);
1300
                                        break;
1301
                                }
1302
                            }
1303

  
1304
                            ChangeComment(adnoerFinal);
1305
                        }
1288
                        ctrl1.SetFontFamily(font.FontFamily);
1289
                    }
1290
                    else if (item is MarkupToPDF.Controls.Text.TextControl ctrl2)
1291
                    {
1292
                        ctrl2.SetFontFamily(font.FontFamily);
1306 1293
                    }
1307 1294
                }
1308 1295

  
......
1311 1298
            }
1312 1299
        }
1313 1300

  
1301
        private List<UIElement> SelectTextControl()
1302
        {
1303
            List<UIElement> lstTextCtrl = new List<UIElement>();
1304

  
1305
            var main = this.ParentOfType<MainWindow>()?.dzMainMenu;
1306
            var font = comboFontFamily.SelectedItem as Markus.Fonts.MarkusFont;
1307

  
1308

  
1309
            if (main.SelectLayer.FindChildByType<AdornerFinal>() != null)
1310
            {
1311
                lstTextCtrl.AddRange(main.SelectLayer.FindChildByType<AdornerFinal>().Members.Where(x => x.DrawingData is MarkupToPDF.Controls.Common.ITextControl).Select(x => x.DrawingData));
1312
            }
1313

  
1314
            lstTextCtrl.AddRange(main.zoomAndPanCanvas.FindAllChildren(x => x is MarkupToPDF.Controls.Common.ITextControl c && (c.IsSelected || c.IsEditingMode == true)).Select(x => (UIElement)x));
1315

  
1316
            return lstTextCtrl;
1317
        }
1318

  
1314 1319

  
1315 1320
        /// <summary>
1316 1321
        /// 텍스트 컨트롤 하일라이트 처리

내보내기 Unified diff