개정판 9380813b
Search Panel 방향키 수정
Text생성시 여러번 클릭 할 경우 입력값이 없으면 생성된 객체 삭제
Font Size에 한글입력 방지
Change-Id: I3b8e47c313869b6e03f0c634cb8ea340c189812d
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 119 | 119 |
private BitmapFrame tempPageImage =null; |
| 120 | 120 |
|
| 121 | 121 |
public Undo_data UndoData { get; set; }
|
| 122 |
public CommentUserInfo previousControl { get; set; }
|
|
| 122 | 123 |
public CommentUserInfo currentControl { get; set; }
|
| 123 | 124 |
public ControlType controlType { get; set; }
|
| 124 | 125 |
private Move move = new Move(); |
| ... | ... | |
| 2209 | 2210 |
// enterMouse.IsSelected = false; |
| 2210 | 2211 |
//} |
| 2211 | 2212 |
|
| 2213 |
|
|
| 2212 | 2214 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseEnter).FirstOrDefault(); |
| 2213 | 2215 |
if (control != null) |
| 2214 | 2216 |
{
|
| ... | ... | |
| 2226 | 2228 |
} |
| 2227 | 2229 |
else |
| 2228 | 2230 |
{
|
| 2231 |
|
|
| 2229 | 2232 |
} |
| 2230 | 2233 |
} |
| 2231 | 2234 |
|
| ... | ... | |
| 3938 | 3941 |
(currentControl as TextControl).ApplyTemplate(); |
| 3939 | 3942 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 3940 | 3943 |
(currentControl as TextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily); |
| 3944 |
|
|
| 3945 |
if(previousControl == null) |
|
| 3946 |
{
|
|
| 3947 |
previousControl = currentControl as TextControl; |
|
| 3948 |
} |
|
| 3949 |
else |
|
| 3950 |
{
|
|
| 3951 |
var vPreviousControl = previousControl as TextControl; |
|
| 3952 |
if (string.IsNullOrEmpty(vPreviousControl.Text)) |
|
| 3953 |
{
|
|
| 3954 |
DeleteCommand.Instance.Execute(new[] { previousControl });
|
|
| 3955 |
previousControl = null; |
|
| 3956 |
} |
|
| 3957 |
else |
|
| 3958 |
{
|
|
| 3959 |
previousControl = currentControl as TextControl; |
|
| 3960 |
} |
|
| 3961 |
} |
|
| 3941 | 3962 |
CreateCommand.Instance.Execute(currentControl); |
| 3963 |
if (previousControl == null) |
|
| 3964 |
previousControl = currentControl; |
|
| 3942 | 3965 |
} |
| 3943 | 3966 |
} |
| 3944 | 3967 |
} |
| ... | ... | |
| 4659 | 4682 |
zoomAndPanControl.CaptureMouse(); |
| 4660 | 4683 |
e.Handled = true; |
| 4661 | 4684 |
} |
| 4685 |
|
|
| 4662 | 4686 |
} |
| 4663 | 4687 |
|
| 4664 | 4688 |
private void zoomAndPanControl2_MouseDown(object sender, MouseButtonEventArgs e) |
내보내기 Unified diff
