Merge pull request #668 from dremin/fix-properties-double-nub

Fix duplicate nub in properties without quicklaunch
dremin · Aug 30, 2023 · e6dd912 · e6dd912
2 parents 3ecff6b + d1ef738
commit e6dd912
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
@@ -126,24 +126,26 @@
                                                            Style="{DynamicResource StartLabel}" />
                                             </Grid>
                                         </ToggleButton>
-                                        <Thumb Style="{DynamicResource ToolbarThumb}"
-                                               DockPanel.Dock="Left"
-                                               Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=LockTaskbar, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource boolToInvertedVisibilityConverter}}" />
-                                        <ItemsControl DockPanel.Dock="Left"
-                                                      Focusable="False"
-                                                      Style="{DynamicResource ToolbarItems}"
-                                                      Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowQuickLaunch, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource boolToVisibilityConverter}}">
-                                            <ItemsControl.ItemsPanel>
-                                                <ItemsPanelTemplate>
-                                                    <WrapPanel Orientation="Horizontal"></WrapPanel>
-                                                </ItemsPanelTemplate>
-                                            </ItemsControl.ItemsPanel>
-                                            <Button Style="{DynamicResource ToolbarButton}"
-                                                    Focusable="False">
-                                                <Image Source="Resources\retrobar.ico"
-                                                       Style="{DynamicResource ToolbarIcon}" />
-                                            </Button>
-                                        </ItemsControl>
+                                        <StackPanel Orientation="Horizontal"
+                                                    Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowQuickLaunch, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource boolToVisibilityConverter}}">
+                                            <Thumb Style="{DynamicResource ToolbarThumb}"
+                                                   DockPanel.Dock="Left"
+                                                   Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=LockTaskbar, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource boolToInvertedVisibilityConverter}}" />
+                                            <ItemsControl DockPanel.Dock="Left"
+                                                          Focusable="False"
+                                                          Style="{DynamicResource ToolbarItems}">
+                                                <ItemsControl.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <WrapPanel Orientation="Horizontal"></WrapPanel>
+                                                    </ItemsPanelTemplate>
+                                                </ItemsControl.ItemsPanel>
+                                                <Button Style="{DynamicResource ToolbarButton}"
+                                                        Focusable="False">
+                                                    <Image Source="Resources\retrobar.ico"
+                                                           Style="{DynamicResource ToolbarIcon}" />
+                                                </Button>
+                                            </ItemsControl>
+                                        </StackPanel>
                                         <Thumb Style="{DynamicResource ToolbarThumb}"
                                                DockPanel.Dock="Left"
                                                Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=LockTaskbar, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource boolToInvertedVisibilityConverter}}" />