개정판 cdfb57ff
zoom control 이벤트 추가
mainmenu 수정
app 수정
Change-Id: I0d007c3a3c412b7fbe6e2a52bafb932e1a7b9f03
KCOM/Views/MainMenu.xaml | ||
---|---|---|
115 | 115 |
MouseMove="zoomAndPanControl_MouseMove" |
116 | 116 |
MouseUp="zoomAndPanControl_MouseUp" |
117 | 117 |
MouseLeave="zoomAndPanControl_MouseLeave" |
118 |
ScaleChanged="ZoomAndPanControl_ScaleChanged" |
|
118 | 119 |
MouseDoubleClick="zoomAndPanControl_MouseDoubleClick" |
119 | 120 |
ContentScale="{Binding ContentScale, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" |
120 | 121 |
ContentOffsetX="{Binding ContentOffsetX, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" |
... | ... | |
162 | 163 |
<!--<MarkupToPDF:RectangleControl Height="200" HorizontalAlignment="Center" Name="rectangle2" StrokeColor="Black" VerticalAlignment="Top" Width="00" FillColor="Red"/>--> |
163 | 164 |
</InkCanvas> |
164 | 165 |
<!--강인구 추가--> |
165 |
<Image Panel.ZIndex="0" x:Name="mainPanel" |
|
166 |
Source="{Binding ImageViewPath, Source={x:Static common:ViewerDataModel.Instance}}" |
|
167 |
Width="{Binding ImageViewWidth, Source={x:Static common:ViewerDataModel.Instance}}" |
|
168 |
Height="{Binding ImageViewHeight, Source={x:Static common:ViewerDataModel.Instance}}" > |
|
169 |
</Image> |
|
170 |
|
|
171 |
<Canvas x:Name="SelectLayer" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Panel.ZIndex="32766"/> |
|
166 |
<Image Panel.ZIndex="0" x:Name="mainPanel" RenderOptions.BitmapScalingMode="HighQuality" RenderOptions.EdgeMode="Unspecified" RenderOptions.ClearTypeHint="Enabled" |
|
167 |
Source="{Binding ImageViewPath,Mode=TwoWay,IsAsync=True, Source={x:Static common:ViewerDataModel.Instance}}" |
|
168 |
Width="{Binding ImageViewWidth,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" |
|
169 |
Height="{Binding ImageViewHeight,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"> |
|
170 |
</Image> |
|
171 |
<Canvas x:Name="SelectLayer" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Panel.ZIndex="32766"/> |
|
172 | 172 |
<Border x:Name="dragSelectionBorder" Visibility="Collapsed" |
173 | 173 |
BorderBrush="Blue" |
174 | 174 |
BorderThickness="1" |
내보내기 Unified diff