개정판 65768148
Revert "issue #20022001: 텍스트 검색 / 마크업 리스트 필터 오류 수정"
This reverts commit 2c629eec51a77c480dea3a490ecbceeb10587964.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I019121c484b36a8f55d859b86a3a7b3a7123ca0c
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 247 | 247 |
//App.splashString(ISplashMessage.MAINMENU_0); |
| 248 | 248 |
InitializeComponent(); |
| 249 | 249 |
|
| 250 |
//List<testItem> testItems = new List<testItem>
|
|
| 251 |
//{
|
|
| 252 |
// new testItem{Title = "test1"},
|
|
| 253 |
// new testItem{Title = "test2"},
|
|
| 254 |
// new testItem{Title = "test3"},
|
|
| 255 |
// new testItem{Title = "test4"},
|
|
| 256 |
//};
|
|
| 250 |
List<testItem> testItems = new List<testItem> |
|
| 251 |
{
|
|
| 252 |
new testItem{Title = "test1"},
|
|
| 253 |
new testItem{Title = "test2"},
|
|
| 254 |
new testItem{Title = "test3"},
|
|
| 255 |
new testItem{Title = "test4"},
|
|
| 256 |
}; |
|
| 257 | 257 |
|
| 258 |
//lstSymbolPrivate.ItemsSource = testItems;
|
|
| 258 |
lstSymbolPrivate.ItemsSource = testItems; |
|
| 259 | 259 |
|
| 260 | 260 |
this.Loaded += MainMenu_Loaded; |
| 261 | 261 |
} |
| ... | ... | |
| 639 | 639 |
/// <param name="e"></param> |
| 640 | 640 |
private async void pageNavigator_PageChanging(object sender, Controls.Sample.PageChangeEventArgs e) |
| 641 | 641 |
{
|
| 642 |
//await Task.Delay(300);
|
|
| 642 |
await Task.Delay(300); |
|
| 643 | 643 |
|
| 644 |
// 마크업 로드 |
|
| 645 | 644 |
await this.Dispatcher.InvokeAsync(()=>MarkupLoad(e.PageNumber)); |
| 646 | 645 |
|
| 647 |
// 페이지 이미지 변경 |
|
| 648 | 646 |
await PageChangingAsync(e.CurrentPage, e.PageNumber); |
| 649 | 647 |
} |
| 650 | 648 |
|
| ... | ... | |
| 673 | 671 |
|
| 674 | 672 |
var pageWidth = Convert.ToDouble(currentPage.PAGE_WIDTH); |
| 675 | 673 |
var pageHeight = Convert.ToDouble(currentPage.PAGE_HEIGHT); |
| 674 |
var pageUri = pageNavigator.CurrentPage.PageUri; |
|
| 676 | 675 |
var contentScale = zoomAndPanControl.ContentScale; |
| 677 | 676 |
|
| 678 | 677 |
#region 페이지 이미지 로딩 수정 |
| 679 | 678 |
|
| 680 |
ViewerDataModel.Instance.ImageViewPath = await App.PageStorage.GetPageAsync(changePageNumber);
|
|
| 679 |
ViewerDataModel.Instance.ImageViewPath = await App.PageStorage.GetPageAsync(pageNavigator.CurrentPage.PageNumber);
|
|
| 681 | 680 |
|
| 682 | 681 |
ScaleImage(pageWidth, pageHeight); |
| 683 | 682 |
|
내보내기 Unified diff
