Merge a055108a53 into e590547b30

Revert "Bug fix"
This reverts commit 5a0fdd971a.
2025-10-28 02:52:53 +00:00 · 2025-05-02 11:15:51 +08:00 · 2025-05-02 10:44:20 +08:00 · 2025-04-29 07:06:23 +03:30 · 2025-04-28 11:56:31 +03:30 · 2025-04-28 15:25:31 +08:00
2 changed files with 25 additions and 6 deletions
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@ -1278,12 +1278,12 @@ public class CoreConfigSingboxService
            detour = Global.DirectTag,
            strategy = string.IsNullOrEmpty(dNSItem?.DomainStrategy4Freedom) ? null : dNSItem?.DomainStrategy4Freedom,
        });
-        dns4Sbox.rules.Add(new()
+        dns4Sbox.rules.Insert(0, new()
        {
            server = tag,
            clash_mode = ERuleMode.Direct.ToString()
        });
-        dns4Sbox.rules.Add(new()
+        dns4Sbox.rules.Insert(0, new()
        {
            server = dns4Sbox.servers.Where(t => t.detour == Global.ProxyTag).Select(t => t.tag).FirstOrDefault() ?? "remote",
            clash_mode = ERuleMode.Global.ToString()
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml
@ -18,9 +18,6 @@
    <UserControl.Resources>
        <BooleanToVisibilityConverter x:Key="BoolToVisConverter" />
        <conv:DelayColorConverter x:Key="DelayColorConverter" />
-        <Style x:Key="AccessibleMyChipListBoxItem" TargetType="ListBoxItem" BasedOn="{StaticResource MyChipListBoxItem}">
-            <Setter Property="AutomationProperties.Name" Value="{Binding Remarks}" />
-        </Style>
    </UserControl.Resources>
    <Grid>
        <DockPanel>
@ -29,7 +26,6 @@
                    x:Name="lstGroup"
                    MaxHeight="200"
                    FontSize="{DynamicResource StdFontSize}"
-                    ItemContainerStyle="{StaticResource AccessibleMyChipListBoxItem}"
                    Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}"
                    AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}">
                    <ListBox.ItemTemplate>
@ -37,6 +33,29 @@
                            <TextBlock Text="{Binding Remarks}" />
                        </DataTemplate>
                    </ListBox.ItemTemplate>
+                    <ListBox.ItemContainerStyle>
+                        <Style TargetType="ListBoxItem" BasedOn="{StaticResource MyChipListBoxItem}">
+                            <Setter Property="Focusable" Value="False" />
+                            <Setter Property="AutomationProperties.Name" Value="{Binding Remarks}" />
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="ListBoxItem">
+                                        <RadioButton
+                                            IsChecked="{TemplateBinding IsSelected}"
+                                            Content="{TemplateBinding Content}"
+                                            AutomationProperties.Name="{Binding Remarks}">
+                                            <RadioButton.ContentTemplate>
+                                                <DataTemplate>
+                                                    <TextBlock
+                                                        AutomationProperties.Name="{Binding Remarks}" />
+                                                </DataTemplate>
+                                            </RadioButton.ContentTemplate>
+                                        </RadioButton>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </ListBox.ItemContainerStyle>
                </ListBox>

                <Button
Author	SHA1	Message	Date
Reza Bakhshi Laktasaraei	182e3d0e72	Merge `a055108a53` into `e590547b30`	2025-05-02 11:15:51 +08:00
2dust	e590547b30	Revert "Bug fix" Some checks are pending release Linux / build (Release) (push) Waiting to run Details release macOS / build (Release) (push) Waiting to run Details release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run Details release Windows / build (Release) (push) Waiting to run Details This reverts commit `5a0fdd971a`.	2025-05-02 10:44:20 +08:00
Reza Bakhshi Laktasaraei	a055108a53	Refactor ListBox in ProfilesView to use custom ItemContainerStyle - Removed unused AccessibleMyChipListBoxItem style from UserControl.Resources. - Added a new ItemContainerStyle directly to the ListBox (lstGroup) with the following changes: - Set Focusable to False to prevent tab focus. - Set AutomationProperties.Name to Remarks for better accessibility. - Used a custom ControlTemplate with a RadioButton for item selection. This improves maintainability and ensures consistent accessibility behavior.	2025-04-29 07:06:23 +03:30
Reza Bakhshi Laktasaraei	72b5a40b95	Merge branch '2dust:master' into accessibility	2025-04-28 11:56:31 +03:30
2dust	cdde1fca09	Update Directory.Packages.props	2025-04-28 15:25:31 +08:00
Reza Bakhshi Laktasaraei	9f9092e9c7	Merge branch '2dust:master' into accessibility	2025-04-27 19:58:29 +03:30
Reza Bakhshi Laktasaraei	3f8bbb6074	Merge branch 'accessibility' of https://github.com/rezabakhshilaktasaraei/v2rayN-accessibility-improvements into accessibility	2025-04-27 19:54:45 +03:30
Reza Bakhshi Laktasaraei	9cc3122bda	Update package versions and fix accessibility in ProfilesView.xaml - Updated package versions in Directory.Packages.props: - Semi.Avalonia and Semi.Avalonia.DataGrid from 11.2.1.6 to 11.2.1.7. - ZXing.Net.Bindings.SkiaSharp from 0.16.14 to 0.16.21. - Fixed MC3024 error in ProfilesView.xaml by creating AccessibleMyChipListBoxItem style: - Added AccessibleMyChipListBoxItem style based on MyChipListBoxItem to set AutomationProperties.Name. - Replaced ItemContainerStyle with AccessibleMyChipListBoxItem to preserve original appearance. - Updated AutomationProperties.Name to use resx:ResUI.menuSubscription for better localization. - Removed duplicate AutomationProperties.Name from TextBlock as it's now handled by the style.	2025-04-27 19:26:23 +03:30
Reza Bakhshi Laktasaraei	dafc765a82	Improve accessibility for cmbServers in StatusBarView.xaml Added ItemContainerStyle to cmbServers to bind AutomationProperties.Name to Text, ensuring screen readers announce the correct values instead of the default object type.	2025-04-27 08:28:32 +03:30
Reza Bakhshi Laktasaraei	b62cfd9d4b	Improve accessibility for ComboBoxes in StatusBarView.xaml Added ItemContainerStyle to cmbRoutings2 and cmbRoutings to bind AutomationProperties.Name to Remarks, ensuring screen readers announce the correct values instead of the default object type.	2025-04-27 03:35:52 +03:30
Reza Bakhshi Laktasaraei	ff7fc64575	Merge branch '2dust:master' into accessibility	2025-04-26 08:43:42 +03:30
Reza Bakhshi Laktasaraei	213c0cd793	Merge branch '2dust:master' into accessibility	2025-04-25 11:26:04 +03:30
Reza Bakhshi Laktasaraei	5c38e96493	Fix Tab navigation in ToolBar by setting KeyboardNavigation to Continue	2025-04-25 10:45:58 +03:30