개정판 409bb3e7
issue #000: Text 입력 중 Selection 버튼 선택 시 TextControl이 없어지는 현상 수정, TopMenu Description, Title 수정
Change-Id: Iebe671a6fd83cca3cffd134ef5b358c1aa095843
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 2366 | 2366 |
#endregion |
| 2367 | 2367 |
#region Select |
| 2368 | 2368 |
case "Select": |
| 2369 |
if(this.ParentOfType<MainWindow>().dzMainMenu.currentControl != null) |
|
| 2369 |
if (this.ParentOfType<MainWindow>().dzMainMenu.currentControl != null)
|
|
| 2370 | 2370 |
{
|
| 2371 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(this.ParentOfType<MainWindow>().dzMainMenu.currentControl); |
|
| 2372 |
this.ParentOfType<MainWindow>().dzMainMenu.currentControl = null; |
|
| 2371 |
if (this.ParentOfType<MainWindow>().dzMainMenu.currentControl is MarkupToPDF.Controls.Text.TextControl |
|
| 2372 |
&& !string.IsNullOrEmpty(((MarkupToPDF.Controls.Text.TextControl)this.ParentOfType<MainWindow>().dzMainMenu.currentControl).Text)) |
|
| 2373 |
{
|
|
| 2374 |
DependencyObject focusScope1 = FocusManager.GetFocusScope((MarkupToPDF.Controls.Text.TextControl)this.ParentOfType<MainWindow>().dzMainMenu.currentControl); |
|
| 2375 |
FocusManager.SetFocusedElement(focusScope1, (MarkupToPDF.Controls.Text.TextControl)this.ParentOfType<MainWindow>().dzMainMenu.currentControl); |
|
| 2376 |
|
|
| 2377 |
this.ParentOfType<MainWindow>().dzMainMenu.currentControl = null; |
|
| 2378 |
Keyboard.ClearFocus(); |
|
| 2379 |
|
|
| 2380 |
} |
|
| 2381 |
else |
|
| 2382 |
{
|
|
| 2383 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(this.ParentOfType<MainWindow>().dzMainMenu.currentControl); |
|
| 2384 |
this.ParentOfType<MainWindow>().dzMainMenu.currentControl = null; |
|
| 2385 |
} |
|
| 2373 | 2386 |
} |
| 2387 |
|
|
| 2374 | 2388 |
this.ParentOfType<MainWindow>().dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Selecting; |
| 2375 | 2389 |
instanceMain.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.None; |
| 2376 | 2390 |
instanceMain.dzMainMenu.isLeftMouseButtonDownOnWindow = false; |
내보내기 Unified diff
