Skip to content

Commit ba3d262

Browse files
committed
MaxResult Item to Theme from General
1 parent 3f710f2 commit ba3d262

File tree

3 files changed

+24
-19
lines changed

3 files changed

+24
-19
lines changed

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,12 @@ public string DateFormat
165165
set => Settings.DateFormat = value;
166166
}
167167

168+
public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);
169+
public bool KeepMaxResults
170+
{
171+
get => Settings.KeepMaxResults;
172+
set => Settings.KeepMaxResults = value;
173+
}
168174
public string ClockText => DateTime.Now.ToString(TimeFormat, Culture);
169175

170176
public string DateText => DateTime.Now.ToString(DateFormat, Culture);

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,24 +153,6 @@
153153
</cc:Card>
154154
</cc:CardGroup>
155155

156-
<cc:CardGroup Margin="0 30 0 0">
157-
<cc:Card
158-
Title="{DynamicResource KeepMaxResults}"
159-
Icon="&#xe8fd;"
160-
Sub="{DynamicResource KeepMaxResultsToolTip}">
161-
<ui:ToggleSwitch IsOn="{Binding KeepMaxResults}" />
162-
</cc:Card>
163-
<cc:Card
164-
Title="{DynamicResource maxShowResults}"
165-
Sub="{DynamicResource maxShowResultsToolTip}"
166-
Visibility="{Binding KeepMaxResults, Converter={StaticResource BoolToVisibilityConverter}}">
167-
<ComboBox
168-
Width="100"
169-
ItemsSource="{Binding MaxResultsRange}"
170-
SelectedItem="{Binding Settings.MaxResultsToShow}" />
171-
</cc:Card>
172-
</cc:CardGroup>
173-
174156
<cc:Card
175157
Title="{DynamicResource defaultFileManager}"
176158
Margin="0 30 0 0"

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,11 +511,28 @@
511511
Text="{DynamicResource browserMoreThemes}"
512512
Uri="{Binding LinkThemeGallery}" />
513513

514+
<cc:CardGroup Margin="0 20 0 0">
515+
<cc:Card
516+
Title="{DynamicResource KeepMaxResults}"
517+
Icon="&#xe8fd;"
518+
Sub="{DynamicResource KeepMaxResultsToolTip}">
519+
<ui:ToggleSwitch IsOn="{Binding KeepMaxResults}" />
520+
</cc:Card>
521+
<cc:Card
522+
Title="{DynamicResource maxShowResults}"
523+
Sub="{DynamicResource maxShowResultsToolTip}"
524+
Visibility="{Binding KeepMaxResults, Converter={StaticResource BoolToVisibilityConverter}}">
525+
<ComboBox
526+
Width="100"
527+
ItemsSource="{Binding MaxResultsRange}"
528+
SelectedItem="{Binding Settings.MaxResultsToShow}" />
529+
</cc:Card>
530+
</cc:CardGroup>
514531

515532
<!-- Fonts and icons -->
516533
<cc:Card
517534
Title="{DynamicResource useGlyphUI}"
518-
Margin="0 20 0 0"
535+
Margin="0 6 0 0"
519536
Icon="&#xf6b8;"
520537
Sub="{DynamicResource useGlyphUIEffect}">
521538
<ui:ToggleSwitch

0 commit comments

Comments
 (0)