개정판 f4ec4218
iSSUE #10000 텍스트 검색에서 검색된 부분 표시되도록 수정
Change-Id: I2e0480818470f463d0ad5d57a114ad46a2e9511f
| KCOM/Controls/SearchPanel.xaml.cs | ||
|---|---|---|
| 385 | 385 |
var widthScale = width / Convert.ToDouble(extractor.GetPageRect_Width(item.PageNo - 1)); |
| 386 | 386 |
var heightScale = height / Convert.ToDouble(extractor.GetPageRect_Height(item.PageNo - 1)); |
| 387 | 387 |
|
| 388 |
var searchFocus = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SearchFocusBorder; |
|
| 389 |
searchFocus.Visibility = Visibility; |
|
| 390 |
|
|
| 391 |
Canvas.SetLeft(searchFocus, item.searchResult.Left * widthScale); |
|
| 392 |
Canvas.SetTop(searchFocus, item.searchResult.Top * heightScale); |
|
| 393 |
searchFocus.Width = item.searchResult.Width * widthScale; |
|
| 394 |
searchFocus.Height = item.searchResult.Height * widthScale; |
|
| 395 |
|
|
| 388 | 396 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.zoomAndPanControl.ZoomTo(new Rect |
| 389 | 397 |
{
|
| 390 | 398 |
X =item.searchResult.Left * widthScale, |
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 13 | 13 |
<VerifyUploadedFiles>false</VerifyUploadedFiles> |
| 14 | 14 |
</PropertyGroup> |
| 15 | 15 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> |
| 16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDAwIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
|
|
| 16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
|
|
| 17 | 17 |
</PropertyGroup> |
| 18 | 18 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
| 19 | 19 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
| KCOM/Views/MainMenu.xaml | ||
|---|---|---|
| 190 | 190 |
CornerRadius="1" |
| 191 | 191 |
Panel.ZIndex="1" |
| 192 | 192 |
Opacity="0.5"/> |
| 193 |
<Border x:Name="dragZoomBorder" Visibility="Collapsed" |
|
| 193 |
|
|
| 194 |
<Border x:Name="dragZoomBorder" Visibility="Collapsed" |
|
| 194 | 195 |
BorderThickness="3" |
| 195 | 196 |
Background="Transparent" |
| 196 | 197 |
CornerRadius="1" |
| ... | ... | |
| 214 | 215 |
CornerRadius="1" |
| 215 | 216 |
Panel.ZIndex="1" |
| 216 | 217 |
Opacity="0.5"/>--> |
| 217 |
|
|
| 218 |
|
|
| 219 |
<!--<Border Background="Red" Panel.ZIndex="1" Opacity="0.5" Visibility="Visible" Width="100" Height="100" />--> |
|
| 218 |
<Border x:Name="SearchFocusBorder" Visibility="Collapsed" |
|
| 219 |
BorderThickness="1" |
|
| 220 |
Background="#50FF5D00" |
|
| 221 |
CornerRadius="1" |
|
| 222 |
Panel.ZIndex="1" IsHitTestVisible="False"/> |
|
| 223 |
<!--<Border Background="Red" Panel.ZIndex="1" Opacity="0.5" Visibility="Visible" Width="100" Height="100" />--> |
|
| 220 | 224 |
</Canvas> |
| 221 | 225 |
|
| 222 | 226 |
<!--<Border Background="Red" Panel.ZIndex="1" Opacity="0.5" Visibility="Visible" Width="1000" Height="1000" IsHitTestVisible="False"/>--> |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 618 | 618 |
{
|
| 619 | 619 |
CompareMode.IsChecked = false; |
| 620 | 620 |
var BalancePoint = ViewerDataModel.Instance.PageBalanceMode == true ? e.PageNumber + ViewerDataModel.Instance.PageBalanceNumber : e.PageNumber; |
| 621 |
|
|
| 621 |
|
|
| 622 | 622 |
#region 페이지가 벗어난 경우 |
| 623 | 623 |
|
| 624 | 624 |
if (BalancePoint < 1) |
| ... | ... | |
| 762 | 762 |
tlSyncPageNum.Text = String.Format("Current Page : {0}", BalancePoint);
|
| 763 | 763 |
} |
| 764 | 764 |
|
| 765 |
SearchFocusBorder.Visibility = Visibility.Collapsed; |
|
| 766 |
|
|
| 765 | 767 |
this.pageNavigator.ChangePage(e.PageNumber); |
| 766 | 768 |
} |
| 767 | 769 |
|
내보내기 Unified diff
