Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
2a1b75e8
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2a1b75e8
编写于
6月 09, 2020
作者:
A
Allison Chou
提交者:
GitHub
6月 09, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #44974 from allisonchou/ChangeSignatureAccessibility
Fix change signature accessibility bugs
上级
bd7ece3d
bfb1fc18
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
18 deletion
+42
-18
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml
...Implementation/ChangeSignature/ChangeSignatureDialog.xaml
+9
-3
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml.cs
...lementation/ChangeSignature/ChangeSignatureDialog.xaml.cs
+33
-15
未找到文件。
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml
浏览文件 @
2a1b75e8
...
...
@@ -48,20 +48,24 @@
<Thickness x:Key="textboxPadding">2</Thickness>
<vs:NegateBooleanConverter x:Key="NegateBooleanConverter"/>
<RoutedUICommand x:Key="MoveUp" />
<RoutedUICommand x:Key="MoveUpFocus" />
<RoutedUICommand x:Key="MoveDown" />
<RoutedUICommand x:Key="MoveDownFocus" />
<RoutedUICommand x:Key="MoveSelectionUp" />
<RoutedUICommand x:Key="MoveSelectionDown" />
<RoutedUICommand x:Key="ClickOK" />
<RoutedUICommand x:Key="ToggleRemovedState" />
</Window.Resources>
<Window.CommandBindings>
<CommandBinding Command="{StaticResource MoveUpFocus}" Executed="MoveUp_Click_FocusRow" />
<CommandBinding Command="{StaticResource MoveUp}" Executed="MoveUp_Click" />
<CommandBinding Command="{StaticResource MoveDownFocus}" Executed="MoveDown_Click_FocusRow" />
<CommandBinding Command="{StaticResource MoveDown}" Executed="MoveDown_Click" />
<CommandBinding Command="{StaticResource ToggleRemovedState}" Executed="ToggleRemovedState" />
</Window.CommandBindings>
<Window.InputBindings>
<KeyBinding Key="Up" Modifiers="Alt" Command="{StaticResource MoveUp}" />
<KeyBinding Key="Down" Modifiers="Alt" Command="{StaticResource MoveDown}" />
<KeyBinding Key="Up" Modifiers="Alt" Command="{StaticResource MoveUp
Focus
}" />
<KeyBinding Key="Down" Modifiers="Alt" Command="{StaticResource MoveDown
Focus
}" />
<KeyBinding Key="Delete" Command="{StaticResource ToggleRemovedState}" />
<KeyBinding Key="Return" Command="{StaticResource ClickOK}" />
</Window.InputBindings>
...
...
@@ -308,7 +312,7 @@
<ScrollViewer Name="Scroller"
AutomationProperties.Name="{Binding SignaturePreviewAutomationText}"
AutomationProperties.LabeledBy="{Binding ElementName=PreviewMethodSignatureLabel}"
IsTabStop="
Tru
e"
IsTabStop="
Fals
e"
Padding="8, 4, 4, 4"
VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
Content="{Binding SignatureDisplay}"
...
...
@@ -318,6 +322,7 @@
<StackPanel Name="ControlButtonsPanel" Grid.Column="1" Grid.Row="0" Height="Auto" Width="Auto" Margin="0, 3, 0, 0" >
<vs:DialogButton Name="UpButton"
AutomationProperties.Name="{Binding MoveUpAutomationText}"
ToolTip="{Binding MoveUpAutomationText}"
Margin="9 0 0 0"
IsEnabled="{Binding CanMoveUp, Mode=OneWay}"
AutomationProperties.AutomationId="UpButton"
...
...
@@ -331,6 +336,7 @@
</vs:DialogButton>
<vs:DialogButton Name="DownButton"
AutomationProperties.Name="{Binding MoveDownAutomationText}"
ToolTip="{Binding MoveDownAutomationText}"
Margin="9 9 0 0"
IsEnabled="{Binding CanMoveDown, Mode=OneWay}"
AutomationProperties.AutomationId="DownButton"
...
...
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml.cs
浏览文件 @
2a1b75e8
...
...
@@ -8,10 +8,8 @@
using
System.Windows.Controls
;
using
System.Windows.Input
;
using
System.Windows.Media
;
using
Microsoft.CodeAnalysis
;
using
Microsoft.CodeAnalysis.ChangeSignature
;
using
Microsoft.VisualStudio.PlatformUI
;
using
Roslyn.Utilities
;
namespace
Microsoft.VisualStudio.LanguageServices.Implementation.ChangeSignature
{
...
...
@@ -85,6 +83,18 @@ private void Cancel_Click(object sender, RoutedEventArgs e)
=>
DialogResult
=
false
;
private
void
MoveUp_Click
(
object
sender
,
EventArgs
e
)
{
MoveUp_UpdateSelectedIndex
();
SetFocusToSelectedRow
(
false
);
}
private
void
MoveUp_Click_FocusRow
(
object
sender
,
EventArgs
e
)
{
MoveUp_UpdateSelectedIndex
();
SetFocusToSelectedRow
(
true
);
}
private
void
MoveUp_UpdateSelectedIndex
()
{
var
oldSelectedIndex
=
Members
.
SelectedIndex
;
if
(
_viewModel
.
CanMoveUp
&&
oldSelectedIndex
>=
0
)
...
...
@@ -93,11 +103,21 @@ private void MoveUp_Click(object sender, EventArgs e)
Members
.
Items
.
Refresh
();
Members
.
SelectedIndex
=
oldSelectedIndex
-
1
;
}
SetFocusToSelectedRow
();
}
private
void
MoveDown_Click
(
object
sender
,
EventArgs
e
)
{
MoveDown_UpdateSelectedIndex
();
SetFocusToSelectedRow
(
false
);
}
private
void
MoveDown_Click_FocusRow
(
object
sender
,
EventArgs
e
)
{
MoveDown_UpdateSelectedIndex
();
SetFocusToSelectedRow
(
true
);
}
private
void
MoveDown_UpdateSelectedIndex
()
{
var
oldSelectedIndex
=
Members
.
SelectedIndex
;
if
(
_viewModel
.
CanMoveDown
&&
oldSelectedIndex
>=
0
)
...
...
@@ -106,8 +126,6 @@ private void MoveDown_Click(object sender, EventArgs e)
Members
.
Items
.
Refresh
();
Members
.
SelectedIndex
=
oldSelectedIndex
+
1
;
}
SetFocusToSelectedRow
();
}
private
void
Remove_Click
(
object
sender
,
RoutedEventArgs
e
)
...
...
@@ -118,7 +136,7 @@ private void Remove_Click(object sender, RoutedEventArgs e)
Members
.
Items
.
Refresh
();
}
SetFocusToSelectedRow
();
SetFocusToSelectedRow
(
true
);
}
private
void
Restore_Click
(
object
sender
,
RoutedEventArgs
e
)
...
...
@@ -129,7 +147,7 @@ private void Restore_Click(object sender, RoutedEventArgs e)
Members
.
Items
.
Refresh
();
}
SetFocusToSelectedRow
();
SetFocusToSelectedRow
(
true
);
}
private
void
Add_Click
(
object
sender
,
RoutedEventArgs
e
)
...
...
@@ -157,7 +175,7 @@ private void Add_Click(object sender, RoutedEventArgs e)
_viewModel
.
AddParameter
(
addedParameter
);
}
SetFocusToSelectedRow
();
SetFocusToSelectedRow
(
false
);
}
private
CallSiteKind
GetCallSiteKind
(
AddParameterDialogViewModel
addParameterViewModel
)
...
...
@@ -178,7 +196,7 @@ private CallSiteKind GetCallSiteKind(AddParameterDialogViewModel addParameterVie
:
CallSiteKind
.
Value
;
}
private
void
SetFocusToSelectedRow
()
private
void
SetFocusToSelectedRow
(
bool
focusRow
)
{
if
(
Members
.
SelectedIndex
>=
0
)
{
...
...
@@ -188,7 +206,7 @@ private void SetFocusToSelectedRow()
row
=
Members
.
ItemContainerGenerator
.
ContainerFromIndex
(
Members
.
SelectedIndex
)
as
DataGridRow
;
}
if
(
row
!=
null
)
if
(
row
!=
null
&&
focusRow
)
{
FocusRow
(
row
);
}
...
...
@@ -216,7 +234,7 @@ private void MoveSelectionUp_Click(object sender, EventArgs e)
}
}
SetFocusToSelectedRow
();
SetFocusToSelectedRow
(
true
);
}
private
void
MoveSelectionDown_Click
(
object
sender
,
EventArgs
e
)
...
...
@@ -227,7 +245,7 @@ private void MoveSelectionDown_Click(object sender, EventArgs e)
Members
.
SelectedIndex
=
oldSelectedIndex
+
1
;
}
SetFocusToSelectedRow
();
SetFocusToSelectedRow
(
true
);
}
private
void
Members_GotKeyboardFocus
(
object
sender
,
KeyboardFocusChangedEventArgs
e
)
...
...
@@ -238,7 +256,7 @@ private void Members_GotKeyboardFocus(object sender, KeyboardFocusChangedEventAr
Members
.
SelectedIndex
=
_viewModel
.
GetStartingSelectionIndex
();
}
SetFocusToSelectedRow
();
SetFocusToSelectedRow
(
true
);
}
private
void
ToggleRemovedState
(
object
sender
,
ExecutedRoutedEventArgs
e
)
...
...
@@ -253,7 +271,7 @@ private void ToggleRemovedState(object sender, ExecutedRoutedEventArgs e)
}
Members
.
Items
.
Refresh
();
SetFocusToSelectedRow
();
SetFocusToSelectedRow
(
true
);
}
internal
TestAccessor
GetTestAccessor
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录