개정판 cbcc1a75
issue #00000 markup 바로가기 페이지 변경시 포커스 안 가는 현상 수정/확대범위 수정
Change-Id: If4d9e7f2a2915f7c491bcd46277800b7f833f3d3
| KCOM/Extensions/MarkupVisitHelper.cs | ||
|---|---|---|
| 53 | 53 |
/// 페이지 변경 후 다시 호출 |
| 54 | 54 |
handler = (snd, evt) => |
| 55 | 55 |
{
|
| 56 |
ViewerDataModel.Instance.PageLoaded -= handler;
|
|
| 56 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.MarkupLoadComplated -= handler;
|
|
| 57 | 57 |
|
| 58 |
Task.Delay(100).ConfigureAwait(true); |
|
| 58 |
//Task.Delay(100).ConfigureAwait(true);
|
|
| 59 | 59 |
|
| 60 |
GotoMarkup(CommentIdList);
|
|
| 60 |
GotoSelectedMarkup(CommentIdList);
|
|
| 61 | 61 |
}; |
| 62 | 62 |
|
| 63 |
ViewerDataModel.Instance.PageLoaded += handler;
|
|
| 63 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.MarkupLoadComplated += handler;
|
|
| 64 | 64 |
|
| 65 | 65 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.GotoPage(commentList.First().PageNumber); |
| 66 | 66 |
} |
| ... | ... | |
| 176 | 176 |
main.zoomAndPanControl.ContentOffsetY = positionY; |
| 177 | 177 |
|
| 178 | 178 |
|
| 179 |
var pageSize = new Size(main.pageNavigator.CurrentPage.Width, main.pageNavigator.CurrentPage.Height);
|
|
| 179 |
var pageSize = new Size(ViewerDataModel.Instance.ImageViewWidth,ViewerDataModel.Instance.ImageViewHeight);
|
|
| 180 | 180 |
|
| 181 | 181 |
double pageAngle = Common.ViewerDataModel.Instance.MarkupAngle; |
| 182 | 182 |
|
| ... | ... | |
| 198 | 198 |
} |
| 199 | 199 |
else |
| 200 | 200 |
{
|
| 201 |
rect.Inflate(rect.Width * 3, rect.Height * 3); |
|
| 201 |
//rect.Inflate(rect.Width * 3, rect.Height * 3);
|
|
| 202 | 202 |
|
| 203 | 203 |
var matrix = MatrixHelper.Rotation(Common.ViewerDataModel.Instance.MarkupAngle); |
| 204 | 204 |
rect.Transform(matrix); |
| 205 |
|
|
| 206 |
|
|
| 207 |
main.zoomAndPanControl.ZoomTo(rect);
|
|
| 205 |
//main.zoomAndPanControl.ZoomTo(rect); |
|
| 206 |
var centerP = new Point(rect.Left + rect.Width / 2, rect.Top + rect.Height / 2); |
|
| 207 |
main.zoomAndPanControl.ZoomPointToViewportCenter(0.3, centerP);
|
|
| 208 | 208 |
} |
| 209 | 209 |
} |
| 210 | 210 |
catch (Exception ex) |
내보내기 Unified diff
