Changeset 1813


Ignore:
Timestamp:
Aug 16, 2010, 1:07:22 AM (11 years ago)
Author:
matkovic
Message:

-fixed input control bug

Location:
trunk/CrypPlugins/WorkspaceManager
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/WorkspaceManager/View/Container/PluginContainerView.xaml

    r1807 r1813  
    1717            <z:BlurIconConverter x:Key="BlurValueConverter"></z:BlurIconConverter>
    1818            <z:ViewStateConverter x:Key="ViewStateConverter"></z:ViewStateConverter>
     19            <z:OverlapConverter x:Key="OverlapConverter"></z:OverlapConverter>
    1920
    2021            <Button x:Key="SettingButton" Name="SettingButton" ToolTip="Settings" Style="{StaticResource ResourceKey=OptionPluginContainerButtonStyle}" Height="30" Width="30" Click="OptionChooseHandler">
     
    175176                                       
    176177                                        <Grid Name="ViewPanel" Width="Auto" Height="Auto" Grid.Row="1" Visibility="Collapsed" Margin="5,0,5,5">
    177                                             <Border x:Name="SettingsPanel" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=SettingsPanel}"></Border>
    178                                             <Border x:Name="PresentationPanel" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=PresentationPanel}"></Border>
    179                                             <Border x:Name="LogPanel" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=LogPanel}">
     178                                            <Border x:Name="SettingsPanel" Panel.ZIndex="{Binding Path=ViewState, Converter={StaticResource ResourceKey=OverlapConverter}, ConverterParameter=SettingsPanel}" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=SettingsPanel}"></Border>
     179                                            <Border x:Name="PresentationPanel" Panel.ZIndex="{Binding Path=ViewState, Converter={StaticResource ResourceKey=OverlapConverter}, ConverterParameter=PresentationPanel}" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=PresentationPanel}"></Border>
     180                                            <Border x:Name="LogPanel" Panel.ZIndex="{Binding Path=ViewState, Converter={StaticResource ResourceKey=OverlapConverter}, ConverterParameter=LogPanel}" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=LogPanel}">
    180181                                                <e:LogPresentation></e:LogPresentation>
    181182                                            </Border>
    182                                             <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
     183                                            <ScrollViewer Panel.ZIndex="{Binding Path=ViewState, Converter={StaticResource ResourceKey=OverlapConverter}, ConverterParameter=DataPanel}" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
    183184                                                <StackPanel Orientation="Vertical" x:Name="DataPanel" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=DataPanel}"></StackPanel>
    184185                                            </ScrollViewer>
  • trunk/CrypPlugins/WorkspaceManager/View/Converter/ViewStateConverter.cs

    r1807 r1813  
    3232                return Visibility.Visible;
    3333
    34             return Visibility.Collapsed;
     34            return Visibility.Hidden;
    3535        }
    3636
  • trunk/CrypPlugins/WorkspaceManager/WorkspaceManager.csproj

    r1812 r1813  
    115115    <Compile Include="View\Converter\NotificationLevelConverter.cs" />
    116116    <Compile Include="View\Converter\OptionTextCaptionConverter.cs" />
     117    <Compile Include="View\Converter\OverlapConverter.cs" />
    117118    <Compile Include="View\Converter\ScaleToPercentageConverter.cs" />
    118119    <Compile Include="View\Converter\ViewStateConverter.cs" />
Note: See TracChangeset for help on using the changeset viewer.