개정판 469b2bbf
- 회전 되어있는 Textbox MultiSelect시 선택 안되는 문제 수정
- SearchPanel 단축 키 변경 (F > Control+F) SearchPanel 단축 키 재 선택 시 Search Panel 숨겨지던 부분 수정(IsHidden -> IsActive)
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 616 | 616 |
#region FIND(Ctrl + F) |
| 617 | 617 |
case Key.F: |
| 618 | 618 |
{
|
| 619 |
if (!this.dzMainMenu.searchPane.IsPinned)
|
|
| 619 |
if (ViewerDataModel.Instance.IsPressCtrl)
|
|
| 620 | 620 |
{
|
| 621 |
this.dzMainMenu.searchPane.IsPinned = true; |
|
| 622 |
if (ViewerDataModel.Instance.searchPDF!=null) |
|
| 621 |
if (!this.dzMainMenu.searchPane.IsPinned) |
|
| 623 | 622 |
{
|
| 624 |
this.dzMainMenu.searchPanel_Instance.tbSearch.Focus(); |
|
| 623 |
this.dzMainMenu.searchPane.IsPinned = true; |
|
| 624 |
if (ViewerDataModel.Instance.searchPDF != null) |
|
| 625 |
{
|
|
| 626 |
this.dzMainMenu.searchPanel_Instance.tbSearch.Focus(); |
|
| 627 |
} |
|
| 628 |
else |
|
| 629 |
{
|
|
| 630 |
this.dzMainMenu.searchPanel_Instance.btnSearch.Focus(); |
|
| 631 |
} |
|
| 625 | 632 |
} |
| 626 | 633 |
else |
| 627 | 634 |
{
|
| 628 |
this.dzMainMenu.searchPanel_Instance.btnSearch.Focus(); |
|
| 635 |
this.dzMainMenu.searchPane.IsPinned = false; |
|
| 636 |
this.dzMainMenu.searchPane.IsActive = false; |
|
| 637 |
//this.dzMainMenu.searchPane.IsHidden = true; |
|
| 629 | 638 |
} |
| 630 | 639 |
} |
| 631 |
else |
|
| 632 |
{
|
|
| 633 |
this.dzMainMenu.searchPane.IsPinned = false; |
|
| 634 |
this.dzMainMenu.searchPane.IsHidden = true; |
|
| 635 |
} |
|
| 636 | 640 |
} |
| 637 | 641 |
break; |
| 638 | 642 |
#endregion |
| KCOM/Events/Move.cs | ||
|---|---|---|
| 235 | 235 |
{
|
| 236 | 236 |
s_point = new Point(); |
| 237 | 237 |
e_point = new Point(); |
| 238 |
|
|
| 239 |
|
|
| 240 |
if (control.GetType().Name == "TextControl") |
|
| 241 |
{
|
|
| 242 |
s_point.X = (control as TextControl).CanvasX; |
|
| 243 |
s_point.Y = (control as TextControl).CanvasY; |
|
| 244 |
|
|
| 245 |
Point length = new Point(); |
|
| 246 |
double angle = (control as TextControl).Angle; |
|
| 247 |
angle = Math.PI * angle / 180; |
|
| 248 |
|
|
| 249 |
length.X = (control as TextControl).BoxWidth * Math.Cos(angle) - (control as TextControl).BoxHeight * Math.Sin(angle); |
|
| 250 |
length.Y = (control as TextControl).BoxWidth * Math.Sin(angle) + (control as TextControl).BoxHeight * Math.Cos(angle); |
|
| 251 |
|
|
| 252 |
e_point.X = s_point.X + length.X; |
|
| 253 |
e_point.Y = s_point.Y + length.Y; |
|
| 254 |
rectSize = e_point - s_point; |
|
| 255 |
|
|
| 256 |
itemRect = new Rect(s_point, new Point(s_point.X + rectSize.X, s_point.Y + rectSize.Y)); |
|
| 257 |
return; |
|
| 258 |
} |
|
| 259 |
|
|
| 238 | 260 |
switch ((control as IMarkupCommonData).ControlType) |
| 239 | 261 |
{
|
| 240 | 262 |
#region Shape |
| ... | ... | |
| 445 | 467 |
#endregion |
| 446 | 468 |
|
| 447 | 469 |
#region Text |
| 448 |
case (ControlType.TextControl): |
|
| 449 |
{
|
|
| 450 |
s_point.X = (control as TextControl).CanvasX; |
|
| 451 |
s_point.Y = (control as TextControl).CanvasY; |
|
| 470 |
//case (ControlType.TextControl):
|
|
| 471 |
// {
|
|
| 472 |
// s_point.X = (control as TextControl).CanvasX;
|
|
| 473 |
// s_point.Y = (control as TextControl).CanvasY;
|
|
| 452 | 474 |
|
| 453 |
e_point.X = s_point.X + (control as TextControl).BoxWidth; |
|
| 454 |
e_point.Y = s_point.Y + (control as TextControl).BoxHeight; |
|
| 475 |
// e_point.X = s_point.X + (control as TextControl).BoxWidth;
|
|
| 476 |
// e_point.Y = s_point.Y + (control as TextControl).BoxHeight;
|
|
| 455 | 477 |
|
| 456 |
rectSize = e_point - s_point; |
|
| 457 |
} |
|
| 458 |
break; |
|
| 478 |
// rectSize = e_point - s_point;
|
|
| 479 |
// }
|
|
| 480 |
// break;
|
|
| 459 | 481 |
|
| 460 |
case (ControlType.TextBorder): |
|
| 461 |
{
|
|
| 482 |
//case (ControlType.TextBorder):
|
|
| 483 |
// {
|
|
| 462 | 484 |
|
| 463 |
s_point.X = (control as TextControl).CanvasX; |
|
| 464 |
s_point.Y = (control as TextControl).CanvasY; |
|
| 485 |
// s_point.X = (control as TextControl).CanvasX;
|
|
| 486 |
// s_point.Y = (control as TextControl).CanvasY;
|
|
| 465 | 487 |
|
| 466 |
e_point.X = s_point.X + (control as TextControl).BoxWidth; |
|
| 467 |
e_point.Y = s_point.Y + (control as TextControl).BoxHeight; |
|
| 488 |
// e_point.X = s_point.X + (control as TextControl).BoxWidth;
|
|
| 489 |
// e_point.Y = s_point.Y + (control as TextControl).BoxHeight;
|
|
| 468 | 490 |
|
| 469 |
rectSize = e_point - s_point; |
|
| 470 |
} |
|
| 471 |
break; |
|
| 491 |
// rectSize = e_point - s_point;
|
|
| 492 |
// }
|
|
| 493 |
// break;
|
|
| 472 | 494 |
|
| 473 |
case (ControlType.TextCloud): |
|
| 474 |
{
|
|
| 495 |
//case (ControlType.TextCloud):
|
|
| 496 |
// {
|
|
| 475 | 497 |
|
| 476 |
s_point.X = (control as TextControl).CanvasX; |
|
| 477 |
s_point.Y = (control as TextControl).CanvasY; |
|
| 498 |
// s_point.X = (control as TextControl).CanvasX;
|
|
| 499 |
// s_point.Y = (control as TextControl).CanvasY;
|
|
| 478 | 500 |
|
| 479 |
e_point.X = s_point.X + (control as TextControl).BoxWidth; |
|
| 480 |
e_point.Y = s_point.Y + (control as TextControl).BoxHeight; |
|
| 501 |
// e_point.X = s_point.X + (control as TextControl).BoxWidth;
|
|
| 502 |
// e_point.Y = s_point.Y + (control as TextControl).BoxHeight;
|
|
| 481 | 503 |
|
| 482 |
rectSize = e_point - s_point; |
|
| 483 |
} |
|
| 484 |
break; |
|
| 504 |
// rectSize = e_point - s_point;
|
|
| 505 |
// }
|
|
| 506 |
// break;
|
|
| 485 | 507 |
#endregion |
| 486 | 508 |
|
| 487 | 509 |
#region ArrowText |
내보내기 Unified diff
