개정판 7e2d682c
ScaleImage 제거
Change-Id: Id23bea93b9db32724e0380642f89eae7346523a5
| KCOM/KCOM.csproj | ||
|---|---|---|
| 1307 | 1307 |
</Target> |
| 1308 | 1308 |
<PropertyGroup> |
| 1309 | 1309 |
<PostBuildEvent>"$(Obfuscar)" obfuscar.xml |
| 1310 |
XCOPY /y /d "$(OutDir)Obfuscator_Output\*.exe" "$(OutDir)"
|
|
| 1311 |
XCOPY /y /d "$(OutDir)Obfuscator_Output\*.dll" "$(OutDir)"</PostBuildEvent>
|
|
| 1310 |
XCOPY /y /d "$(TargetDir)Obfuscator_Output\*.exe" "$(TargetDir)"
|
|
| 1311 |
XCOPY /y /d "$(TargetDir)Obfuscator_Output\*.dll" "$(TargetDir)"</PostBuildEvent>
|
|
| 1312 | 1312 |
</PropertyGroup> |
| 1313 | 1313 |
<Import Project="..\packages\System.Data.SQLite.Core.1.0.110.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.110.0\build\net45\System.Data.SQLite.Core.targets')" />
|
| 1314 | 1314 |
</Project> |
| KCOM/Views/MainMenu.xaml | ||
|---|---|---|
| 163 | 163 |
<!--<MarkupToPDF:RectangleControl Height="200" HorizontalAlignment="Center" Name="rectangle2" StrokeColor="Black" VerticalAlignment="Top" Width="00" FillColor="Red"/>--> |
| 164 | 164 |
</InkCanvas> |
| 165 | 165 |
<!--강인구 추가--> |
| 166 |
<controls:ScaleDecodeImage Panel.ZIndex="0" x:Name="mainPanel" |
|
| 166 |
<!--<controls:ScaleDecodeImage Panel.ZIndex="0" x:Name="mainPanel"
|
|
| 167 | 167 |
Source="{Binding ImageViewPath,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
|
| 168 | 168 |
Width="{Binding ImageViewWidth,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
|
| 169 | 169 |
Height="{Binding ImageViewHeight,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}">
|
| 170 |
</controls:ScaleDecodeImage> |
|
| 171 |
<!--<Image Panel.ZIndex="0" x:Name="mainPanel" RenderOptions.BitmapScalingMode="HighQuality" RenderOptions.EdgeMode="Unspecified" RenderOptions.ClearTypeHint="Enabled" |
|
| 170 |
</controls:ScaleDecodeImage>--> |
|
| 171 |
<Image Panel.ZIndex="0" x:Name="mainPanel" RenderOptions.BitmapScalingMode="HighQuality" |
|
| 172 |
RenderOptions.EdgeMode="Unspecified" RenderOptions.ClearTypeHint="Enabled" |
|
| 172 | 173 |
Source="{Binding ImageViewPath,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
|
| 174 |
Width="{Binding ImageViewWidth,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
|
|
| 175 |
Height="{Binding ImageViewHeight,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
|
|
| 173 | 176 |
> |
| 174 |
</Image>-->
|
|
| 177 |
</Image> |
|
| 175 | 178 |
<Canvas x:Name="SelectLayer" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Panel.ZIndex="32766"/> |
| 176 | 179 |
<Border x:Name="dragSelectionBorder" Visibility="Collapsed" |
| 177 | 180 |
BorderBrush="Blue" |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 5248 | 5248 |
/// <returns></returns> |
| 5249 | 5249 |
private void ScaleImage(double pageWidth,double pageHeight) |
| 5250 | 5250 |
{
|
| 5251 |
mainPanel.Scale = zoomAndPanControl.ContentScale;// (zoomAndPanControl.ContentScale >= 0.1) ? 1 : zoomAndPanControl.ContentScale; |
|
| 5251 |
//mainPanel.Scale = zoomAndPanControl.ContentScale;// (zoomAndPanControl.ContentScale >= 0.1) ? 1 : zoomAndPanControl.ContentScale;
|
|
| 5252 | 5252 |
} |
| 5253 | 5253 |
|
| 5254 | 5254 |
private void thumbnailPanel_SizeChanged(object sender, SizeChangedEventArgs e) |
내보내기 Unified diff
