Merge pull request #4822 from toggl-open-source/fix/autotracker-list-…

…barely-visible Fix autotracker list visibility in high-scaling or lower-resolution scenarios
toggl-open-source · Feb 23, 2021 · 695bc71 · 695bc71
2 parents 09e5172 + 41d2cc1
commit 695bc71
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 39 deletions.
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/controls/AutotrackerSettings.xaml b/src/ui/windows/TogglDesktop/TogglDesktop/ui/controls/AutotrackerSettings.xaml
@@ -88,15 +88,13 @@
             <TextBlock Text="Keyword" Grid.Column="0" Grid.Row="2" Style="{StaticResource Toggl.CaptionText}" Margin="12 19 0 0"/>
             <TextBlock Text="Project name" Grid.Column="1" Grid.Row="2" Style="{StaticResource Toggl.CaptionText}" Margin="12 19 0 0"/>
         </Grid>
-        <ScrollViewer Grid.Row="2"
-            Margin="0 10 0 0" Focusable="True" IsTabStop="True"
-            GotKeyboardFocus="onListGotKeyboardFocus"
-            LostKeyboardFocus="onListLostKeyboardFocus"
-            PreviewKeyDown="onListPreviewKeyDown"
-            VerticalScrollBarVisibility="Auto">
-            <StackPanel Name="rulesPanel" x:FieldModifier="private">
-                <!-- filled programmatically -->
-            </StackPanel>
-        </ScrollViewer>
+        <StackPanel Name="rulesPanel" x:FieldModifier="private"
+                    Grid.Row="2"
+                    Margin="0 10 0 0" Focusable="True"
+                    GotKeyboardFocus="onListGotKeyboardFocus"
+                    LostKeyboardFocus="onListLostKeyboardFocus"
+                    PreviewKeyDown="onListPreviewKeyDown">
+            <!-- filled programmatically -->
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/windows/PreferencesWindow.xaml b/src/ui/windows/TogglDesktop/TogglDesktop/ui/windows/PreferencesWindow.xaml
@@ -325,36 +325,39 @@
             </TabItem>
 
             <TabItem Header="Autotracker">
-                <Grid Margin="24 32 20 0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel Orientation="Vertical">
-                        <TextBlock Style="{StaticResource Toggl.TitleText}"
-                                   Text="Autotracker" />
-                        <TextBlock Margin="0 12 0 0"
-                                   Style="{StaticResource Toggl.CaptionText}"
-                                   Text="Autotracker helps to make time tracking faster by triggering customized suggestions. When a selected app is open in the foreground, you'll get one of the prefilled suggestions." />
-                        <mah:ToggleSwitch Name="enableAutotrackerCheckbox" x:FieldModifier="private"
-                                          Margin="0 14 0 0"/>
-                    </StackPanel>
-                    <StackPanel Grid.Row="1" IsEnabled="{Binding ElementName=enableAutotrackerCheckbox, Path=IsChecked}"
-                                Margin="0 30 0 0">
-                        <TextBlock Style="{StaticResource Toggl.BodyText}"
-                                   Text="Show suggestions also when the timer is running" />
-                        <mah:ToggleSwitch x:Name="showAutotrackerWhileTimerIsRunning" x:FieldModifier="private"
-                                          Margin="0 14 0 0" />
-                        <TextBlock Style="{StaticResource Toggl.BodyText}"
-                                   Margin="0 12 0 0"
-                                   Text="Allow starting tracking automatically without showing the suggestion" />
-                        <mah:ToggleSwitch x:Name="startTrackingWithoutSuggestionCheckbox" x:FieldModifier="private"
-                                          Margin="0 14 0 0" />
-                    </StackPanel>
+                <ScrollViewer>
+                    <Grid Margin="24 32 20 0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock Style="{StaticResource Toggl.TitleText}"
+                                       Text="Autotracker" />
+                            <TextBlock Margin="0 12 0 0"
+                                       Style="{StaticResource Toggl.CaptionText}"
+                                       Text="Autotracker helps to make time tracking faster by triggering customized suggestions. When a selected app is open in the foreground, you'll get one of the prefilled suggestions." />
+                            <mah:ToggleSwitch Name="enableAutotrackerCheckbox" x:FieldModifier="private"
+                                              Margin="0 14 0 0"/>
+                        </StackPanel>
+                        <StackPanel Grid.Row="1" IsEnabled="{Binding ElementName=enableAutotrackerCheckbox, Path=IsChecked}"
+                                    Margin="0 30 0 0">
+                            <TextBlock Style="{StaticResource Toggl.BodyText}"
+                                       Text="Show suggestions also when the timer is running" />
+                            <mah:ToggleSwitch x:Name="showAutotrackerWhileTimerIsRunning" x:FieldModifier="private"
+                                              Margin="0 14 0 0" />
+                            <TextBlock Style="{StaticResource Toggl.BodyText}"
+                                       Margin="0 12 0 0"
+                                       Text="Allow starting tracking automatically without showing the suggestion" />
+                            <mah:ToggleSwitch x:Name="startTrackingWithoutSuggestionCheckbox" x:FieldModifier="private"
+                                              Margin="0 14 0 0" />
+                        </StackPanel>
 
-                    <toggl:AutotrackerSettings Grid.Row="2" Margin="0 22 0 12" IsEnabled="{Binding ElementName=enableAutotrackerCheckbox, Path=IsChecked}"/>
-                </Grid>
+                        <toggl:AutotrackerSettings Grid.Row="2" Margin="0 22 0 12" IsEnabled="{Binding ElementName=enableAutotrackerCheckbox, Path=IsChecked}"/>
+                    </Grid>
+
+                </ScrollViewer>
             </TabItem>
             <TabItem Header="Proxy">
                 <StackPanel Margin="24 32 20 48">