fix: 相殺できないコントロールにTABキーで移動できていた不具合修正 (#1880)

neelabo · neelabo · commit 4ce07902933d · 2026-02-22T21:59:31.000+09:00
- 各種カスタムコントロールのFocusableとIsTabStopを整備
- CheckBoxのFocusVisualStyle設定
- Tabの順番がおかしい箇所を修正
- GridSplitterのFocusVisualStyle調整
diff --git a/NeeView/NeeView/Runtime/LayoutPanel/LayoutDockPanel.cs b/NeeView/NeeView/Runtime/LayoutPanel/LayoutDockPanel.cs
@@ -150,6 +150,7 @@ private void AddPanelSplitterVertical()
                 HorizontalAlignment = HorizontalAlignment.Stretch,
                 VerticalAlignment = VerticalAlignment.Center,
                 Height = _splitterWidth - 2.0,
+                FocusVisualStyle= App.Current.Resources["NVFocusVisual"] as Style,
             };
             splitter.SetBinding(GridSplitter.BackgroundProperty, new Binding(nameof(BorderBrush)) { Source = this });
             Grid.SetRow(splitter, this.RowDefinitions.Count - 1);
@@ -166,6 +167,7 @@ private void AddPanelSplitterHorizontal()
                 HorizontalAlignment = HorizontalAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Stretch,
                 Width = _splitterWidth - 2.0,
+                FocusVisualStyle = App.Current.Resources["NVFocusVisual"] as Style,
             };
             splitter.SetBinding(GridSplitter.BackgroundProperty, new Binding(nameof(BorderBrush)) { Source = this });
             Grid.SetColumn(splitter, this.ColumnDefinitions.Count - 1);
diff --git a/NeeView/Print/PrintWindow.xaml b/NeeView/Print/PrintWindow.xaml
@@ -144,7 +144,7 @@
                                                     <nvc:EnterTriggerTextBox Text="{Binding Model.Rows}" Margin="2" TabIndex="2" />
                                                 </DockPanel>
                                             </UniformGrid>
-                                            <Button x:Name="ResetButton" Style="{StaticResource IconButton}" HorizontalAlignment="Right" Margin="0,20,0,0" Command="{Binding ResetCommand}">
+                                            <Button x:Name="ResetButton" Style="{StaticResource IconButton}" HorizontalAlignment="Right" Margin="0,20,0,0" Command="{Binding ResetCommand}" TabIndex="2">
                                                 <TextBlock Margin="5" Text="{properties:TextBinding Word.Reset}" Foreground="{DynamicResource Control.Accent}" />
                                             </Button>
                                         </StackPanel>
diff --git a/NeeView/Setting/ContextMenuSettingControl.xaml b/NeeView/Setting/ContextMenuSettingControl.xaml
@@ -38,7 +38,7 @@
     <Grid x:Name="Root">
         <Border BorderBrush="Gray" BorderThickness="0" Margin="0,20,0,0" >
             <DockPanel Margin="0,10,10,0">
-                <TreeView x:Name="ContextMenuTreeView" BorderBrush="{DynamicResource Control.Border}" BorderThickness="0" TabIndex="10"
+                <TreeView x:Name="ContextMenuTreeView" BorderBrush="{DynamicResource Control.Border}" BorderThickness="0"
                                           HorizontalContentAlignment="Stretch" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                           ItemsSource="{Binding MenuTree.Root.Children}" ItemTemplate="{StaticResource treeViewTemplate}"
                                           ContextMenuOpening="ContextMenuTreeView_ContextMenuOpening"
diff --git a/NeeView/Setting/SettingItem.cs b/NeeView/Setting/SettingItem.cs
@@ -801,6 +801,7 @@ public static TextBlock CreateHyperlink(string text, ICommand command)
             var link = new Hyperlink();
             link.Inlines.Add(text);
             link.Command = command;
+            link.FocusVisualStyle = App.Current.Resources["NVBorderFocusVisual"] as Style;
             textBlock.Inlines.Add(link);
             return textBlock;
         }
diff --git a/NeeView/Setting/SettingItemFileAssociationGroupControl.xaml b/NeeView/Setting/SettingItemFileAssociationGroupControl.xaml
@@ -35,17 +35,17 @@
     </UserControl.Resources>
 
     <Grid>
-        <GroupBox>
+        <GroupBox KeyboardNavigation.TabNavigation="Local">
             <GroupBox.Header>
-                <CheckBox x:Name="HeaderCheckBox" Content="{Binding Title}" IsChecked="{Binding IsChecked}">
+                <CheckBox x:Name="HeaderCheckBox" Content="{Binding Title}" IsChecked="{Binding IsChecked}" TabIndex="1">
                     <CheckBox.ContextMenu>
                         <ContextMenu>
                             <MenuItem Header="{properties:TextBinding FileAssociation.Menu.ChangeCategoryIcon}" Command="{Binding ChangeCategoryIconCommand}"/>
                         </ContextMenu>
                     </CheckBox.ContextMenu>
                 </CheckBox>
             </GroupBox.Header>
-            <ItemsControl x:Name="AssociationListBox" ItemsSource="{Binding Items}" Margin="20,5,5,5"/>
+            <ItemsControl x:Name="AssociationListBox" ItemsSource="{Binding Items}" Margin="20,5,5,5" TabIndex="2" IsTabStop="False"/>
         </GroupBox>
     </Grid>
 </UserControl>
diff --git a/NeeView/SidePanels/Bookmark/BookmarkListView.xaml b/NeeView/SidePanels/Bookmark/BookmarkListView.xaml
@@ -155,8 +155,8 @@
                 </local:FolderTreeView.Style>
             </local:FolderTreeView>
 
-            <GridSplitter x:Name="FolderTreeAreaSplitter" IsTabStop="False" UseLayoutRounding="True" SnapsToDevicePixels="True" Background="{DynamicResource  Panel.Splitter}"
-                          MinWidth="6" MinHeight="6"
+            <GridSplitter x:Name="FolderTreeAreaSplitter" UseLayoutRounding="True" SnapsToDevicePixels="True" Background="{DynamicResource  Panel.Splitter}"
+                          MinWidth="6" MinHeight="6" FocusVisualStyle="{StaticResource NVFocusVisual}"
                           Visibility="{Binding IsFolderTreeVisible, Converter={StaticResource BooleanToVisibilityConverter}}">
                 <GridSplitter.Style>
                     <Style TargetType="GridSplitter">
diff --git a/NeeView/SidePanels/Bookshelf/FolderListView.xaml b/NeeView/SidePanels/Bookshelf/FolderListView.xaml
@@ -227,8 +227,8 @@
                 </local:FolderTreeView.Style>
             </local:FolderTreeView>
 
-            <GridSplitter x:Name="FolderTreeAreaSplitter" IsTabStop="False" UseLayoutRounding="True" SnapsToDevicePixels="True" Background="{DynamicResource  Panel.Splitter}"
-                          MinWidth="6" MinHeight="6"
+            <GridSplitter x:Name="FolderTreeAreaSplitter" UseLayoutRounding="True" SnapsToDevicePixels="True" Background="{DynamicResource Panel.Splitter}"
+                          MinWidth="6" MinHeight="6" FocusVisualStyle="{StaticResource NVFocusVisual}"
                           Visibility="{Binding IsFolderTreeVisible, Converter={StaticResource BooleanToVisibilityConverter}}">
                 <GridSplitter.Style>
                     <Style TargetType="GridSplitter">
diff --git a/NeeView/SidePanels/Bookshelf/FolterTree/FolderTreeModel.cs b/NeeView/SidePanels/Bookshelf/FolterTree/FolderTreeModel.cs
@@ -90,6 +90,11 @@ public void ExpandRoot()
             }
         }
 
+        public void SelectFirstItem()
+        {
+            SelectedItem = _rootQuickAccess ?? _rootBookmarkFolder;
+        }
+
         public void SelectRootQuickAccess()
         {
             SelectedItem = _rootQuickAccess;
diff --git a/NeeView/SidePanels/Bookshelf/FolterTree/FolderTreeView.xaml.cs b/NeeView/SidePanels/Bookshelf/FolterTree/FolderTreeView.xaml.cs
@@ -301,7 +301,7 @@ public void FocusSelectedItem()
 
             if (this.TreeView.SelectedItem == null)
             {
-                _vm.SelectRootQuickAccess();
+                _vm.SelectFirstItem();
             }
 
             if (_vm.Model.IsFocusAtOnce)
diff --git a/NeeView/SidePanels/Bookshelf/FolterTree/FolderTreeViewModel.cs b/NeeView/SidePanels/Bookshelf/FolterTree/FolderTreeViewModel.cs
@@ -60,9 +60,9 @@ private void Model_SelectedItemChanged(object? sender, EventArgs e)
             SelectedItemChanged?.Invoke(sender, e);
         }
 
-        public void SelectRootQuickAccess()
+        public void SelectFirstItem()
         {
-            Model?.SelectRootQuickAccess();
+            Model?.SelectFirstItem();
         }
 
         public void Decide(object item)
diff --git a/NeeView/SidePanels/Navigate/NavigateView.xaml b/NeeView/SidePanels/Navigate/NavigateView.xaml
@@ -306,10 +306,10 @@
                                     <nvc:ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsBaseScaleEnabled}" Margin="10,0,0,0" VerticalAlignment="Center" />
                                     <TextBlock Text="{properties:TextBinding Navigator.StretchScale}" VerticalAlignment="Center" />
                                 </DockPanel>
-                                <DockPanel Margin="0,2" Visibility="{Binding IsBaseScaleEnabled, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <DockPanel Margin="0,2" Visibility="{Binding IsBaseScaleEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" KeyboardNavigation.TabNavigation="Local">
                                     <nvc:EnterTriggerTextBox DockPanel.Dock="Right" Text="{Binding BaseScale, StringFormat={}{0:F0}}" Width="70" VerticalAlignment="Center" Margin="5,0,0,0"
-                                            ValueDeltaChanged="BaseScale_ValueDelta" />
-                                    <Slider Value="{Binding SliderBaseScale}" Minimum="10.0" Maximum="190.0" VerticalAlignment="Center" />
+                                            ValueDeltaChanged="BaseScale_ValueDelta" TabIndex="2" />
+                                    <Slider Value="{Binding SliderBaseScale}" Minimum="10.0" Maximum="190.0" VerticalAlignment="Center" TabIndex="1" />
                                 </DockPanel>
                             </StackPanel>
                         </StackPanel>
diff --git a/NeeView/SidePanels/SidePanelFrameView.xaml b/NeeView/SidePanels/SidePanelFrameView.xaml
@@ -164,11 +164,11 @@
                 <Grid x:Name="CenterPanel" Grid.Column="1"/>
 
                 <GridSplitter x:Name="LeftSplitter" Grid.Column="1" Style="{StaticResource PanelGridSplitterStyle}" HorizontalAlignment="Left"
-                              KeyboardNavigation.TabNavigation="Local" KeyboardNavigation.TabIndex="3" FocusVisualStyle="{StaticResource NVBorderFocusVisual}"
+                              KeyboardNavigation.TabNavigation="Local" KeyboardNavigation.TabIndex="3" FocusVisualStyle="{StaticResource NVFocusVisual}"
                               Visibility="{Binding ElementName=LeftPanel, Path=Visibility}"/>
 
                 <GridSplitter x:Name="RightSplitter" Grid.Column="1" Style="{StaticResource PanelGridSplitterStyle}"  HorizontalAlignment="Right"
-                              KeyboardNavigation.TabNavigation="Local" KeyboardNavigation.TabIndex="4" FocusVisualStyle="{StaticResource NVBorderFocusVisual}"
+                              KeyboardNavigation.TabNavigation="Local" KeyboardNavigation.TabIndex="4" FocusVisualStyle="{StaticResource NVFocusVisual}"
                               Visibility="{Binding ElementName=RightPanel, Path=Visibility}"/>
             </Grid>
         </Grid>
diff --git a/NeeView/Styles/Generic.xaml b/NeeView/Styles/Generic.xaml
@@ -11,6 +11,7 @@
     <local:NullableToInverseVisibilityConverter x:Key="NullableToInverseVisibilityConverter"/>
 
     <Style TargetType="{x:Type local:ThumbnailListImage}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Background" Value="{DynamicResource Thumbnail.Foreground}"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -44,6 +45,7 @@
     <local:ContentProfileToolTopEnableConverter x:Key="ContentProfileToolTopEnableConverter" />
 
     <Style TargetType="{x:Type local:PanelListContentImage}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Width" Value="{Binding Source={x:Static local:Config.Current}, Path=Panels.ContentItemProfile.ShapeWidth, Mode=OneTime}"/>
         <Setter Property="Height" Value="{Binding Source={x:Static local:Config.Current}, Path=Panels.ContentItemProfile.ShapeHeight, Mode=OneTime}"/>
         <Setter Property="Template">
@@ -80,6 +82,7 @@
     <local:BannerProfileToolTopEnableConverter x:Key="BannerProfileToolTopEnableConverter" />
 
     <Style TargetType="{x:Type local:PanelListBannerImage}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Width" Value="{Binding Source={x:Static local:Config.Current}, Path=Panels.BannerItemProfile.ShapeWidth, Mode=OneTime}"/>
         <Setter Property="Height" Value="{Binding Source={x:Static local:Config.Current}, Path=Panels.BannerItemProfile.ShapeHeight, Mode=OneTime}"/>
         <Setter Property="Template">
@@ -114,6 +117,7 @@
     <local:ThumbnailProfileToolTopEnableConverter x:Key="ThumbnailProfileToolTopEnableConverter" />
 
     <Style TargetType="{x:Type local:PanelListThumbnailImage}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Width" Value="{Binding Source={x:Static local:Config.Current}, Path=Panels.ThumbnailItemProfile.ShapeWidth, Mode=OneTime}"/>
         <Setter Property="Height" Value="{Binding Source={x:Static local:Config.Current}, Path=Panels.ThumbnailItemProfile.ShapeHeight, Mode=OneTime}"/>
         <Setter Property="Template">
@@ -150,6 +154,7 @@
     <local:FolderItemIconOverlayToImageSourceConverter x:Key="FolderItemIconOverlayToImageSourceConverter"/>
 
     <Style TargetType="{x:Type local:FolderListIcon}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Height" Value="20"/>
         <Setter Property="FolderIcon" Value="{StaticResource ic_dummy}"/>
         <Setter Property="LinkIcon" Value="{StaticResource ic_dummy}"/>
@@ -188,6 +193,7 @@
     <!--#region MoreButton-->
 
     <Style TargetType="{x:Type local:MoreMenuButton}">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Width" Value="28"/>
         <Setter Property="ImageSource" Value="{StaticResource ic_dummy}"/>
         <Setter Property="Template">
@@ -406,6 +412,7 @@
     <!--#region ActiveMarker-->
 
     <Style TargetType="{x:Type local:ActiveMarker}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:ActiveMarker}">
@@ -424,6 +431,7 @@
     <!--#region ProgressRing-->
 
     <Style TargetType="{x:Type local:ProgressRing}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Foreground" Value="{DynamicResource Control.Accent}"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -445,6 +453,7 @@
     <!--#region SizeInspector-->
 
     <Style TargetType="{x:Type nwc:SizeInspector}">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type nwc:SizeInspector}">
@@ -470,20 +479,21 @@
     <!--#region PointInspector-->
 
     <Style TargetType="{x:Type nwc:PointInspector}">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type nwc:PointInspector}">
                     <Grid x:Name="PART_Root">
                         <StackPanel>
-                            <DockPanel Margin="0,0,0,5">
+                            <DockPanel Margin="0,0,0,5" KeyboardNavigation.TabNavigation ="Local">
                                 <TextBlock Text="X" Width="16"/>
-                                <nwc:EnterTriggerTextBox DockPanel.Dock="Right" Width="70" Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=X}" Slider="{Binding ElementName=PART_SliderX}"/>
-                                <Slider x:Name="PART_SliderX" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=X}" Minimum="0" Maximum="1" TickFrequency="0.01" Margin="5,0"/>
+                                <nwc:EnterTriggerTextBox DockPanel.Dock="Right" Width="70" Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=X}" Slider="{Binding ElementName=PART_SliderX}" TabIndex="1"/>
+                                <Slider x:Name="PART_SliderX" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=X}" Minimum="0" Maximum="1" TickFrequency="0.01" Margin="5,0" TabIndex="0"/>
                             </DockPanel>
-                            <DockPanel Margin="0,0,0,5">
+                            <DockPanel Margin="0,0,0,5" KeyboardNavigation.TabNavigation ="Local">
                                 <TextBlock Text="Y" Width="16"/>
-                                <nwc:EnterTriggerTextBox DockPanel.Dock="Right" Width="70" Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Y}" Slider="{Binding ElementName=PART_SliderY}"/>
-                                <Slider x:Name="PART_SliderY" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Y}" Minimum="0" Maximum="1" TickFrequency="0.01" Margin="5,0"/>
+                                <nwc:EnterTriggerTextBox DockPanel.Dock="Right" Width="70" Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Y}" Slider="{Binding ElementName=PART_SliderY}" TabIndex="1"/>
+                                <Slider x:Name="PART_SliderY" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Y}" Minimum="0" Maximum="1" TickFrequency="0.01" Margin="5,0" TabIndex="0"/>
                             </DockPanel >
                         </StackPanel>
                     </Grid>
@@ -499,6 +509,7 @@
     <nwd:NotBoolToVisiblityConverter x:Key="NotBoolToVisiblityConverter"/>
 
     <Style TargetType="{x:Type nwc:FileNameBox}">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type nwc:FileNameBox}">
@@ -541,6 +552,7 @@
     <!--#region TextBoxWithMessage-->
 
     <Style TargetType="{x:Type nwc:TextBoxWithMessage}">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type nwc:TextBoxWithMessage}">
@@ -586,6 +598,7 @@
     <!--#region CropControl-->
 
     <Style TargetType="{x:Type local:CropControl}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:CropControl}">
@@ -608,6 +621,7 @@
     <local:IsNearZeroConverter x:Key="IsNearZeroConverter"/>
 
     <Style TargetType="{x:Type local:NowLoadingView}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:NowLoadingView}">
@@ -645,6 +659,7 @@
     <!--#region PageLoadingControl-->
 
     <Style TargetType="{x:Type local:PageLoadingControl}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:PageLoadingControl}">
@@ -693,7 +708,7 @@
     </Style>
 
     <Style TargetType="{x:Type local:VisiblePasswordBox}">
-        <Setter Property="FocusManager.IsFocusScope" Value="True"/>
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="VisibleOnIcon" Value="{StaticResource ic_dummy}"/>
         <Setter Property="VisibleOffIcon" Value="{StaticResource ic_dummy}"/>
         <Setter Property="Template">
diff --git a/NeeView/Styles/NVStyles.xaml b/NeeView/Styles/NVStyles.xaml
@@ -1154,6 +1154,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource Control.Foreground}" />
         <Setter Property="Margin" Value="0,2" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource NVBorderFocusVisual}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">

Original file line number	Diff line number	Diff line change
`@@ -801,6 +801,7 @@ public static TextBlock CreateHyperlink(string text, ICommand command)`
`801`	`801`	`var link = new Hyperlink();`
`802`	`802`	`link.Inlines.Add(text);`
`803`	`803`	`link.Command = command;`
	`804`	`+ link.FocusVisualStyle = App.Current.Resources["NVBorderFocusVisual"] as Style;`
`804`	`805`	`textBlock.Inlines.Add(link);`
`805`	`806`	`return textBlock;`
`806`	`807`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,11 @@ public void ExpandRoot()`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
	`93`	`+ public void SelectFirstItem()`
	`94`	`+ {`
	`95`	`+ SelectedItem = _rootQuickAccess ?? _rootBookmarkFolder;`
	`96`	`+ }`
	`97`	`+`
`93`	`98`	`public void SelectRootQuickAccess()`
`94`	`99`	`{`
`95`	`100`	`SelectedItem = _rootQuickAccess;`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ public void FocusSelectedItem()`
`301`	`301`
`302`	`302`	`if (this.TreeView.SelectedItem == null)`
`303`	`303`	`{`
`304`		`- _vm.SelectRootQuickAccess();`
	`304`	`+ _vm.SelectFirstItem();`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`if (_vm.Model.IsFocusAtOnce)`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@ private void Model_SelectedItemChanged(object? sender, EventArgs e)`
`60`	`60`	`SelectedItemChanged?.Invoke(sender, e);`
`61`	`61`	`}`
`62`	`62`
`63`		`- public void SelectRootQuickAccess()`
	`63`	`+ public void SelectFirstItem()`
`64`	`64`	`{`
`65`		`- Model?.SelectRootQuickAccess();`
	`65`	`+ Model?.SelectFirstItem();`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public void Decide(object item)`