prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Adjust Setting order

Browse source 
- Fix Plugin Activation Icon display
This commit is contained in:
DB p 2025-03-11 11:55:41 +09:00
parent f5d91550f2
commit 4fd5e1558d
3 changed files with 43 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Flow.Launcher.Core/Resource/Theme.cs
View file

@ -270,12 +270,17 @@ namespace Flow.Launcher.Core.Resource
windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background")); windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Color.FromArgb(1, 0, 0, 0)))); // 드래그 가능 투명색 windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Color.FromArgb(1, 0, 0, 0)))); // 드래그 가능 투명색
} }
else else if (_settings.BackdropType == BackdropTypes.Acrylic)
{ {
windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background")); windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Colors.Transparent))); windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Colors.Transparent)));
} }
else
{
//windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
//windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Colors.Transparent)));
}
Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, backdropValue);
ThemeModeColor(BlurMode()); // ✅ 테마 모드 적용 ThemeModeColor(BlurMode()); // ✅ 테마 모드 적용
} }
else else

62
Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
View file

@ -371,36 +371,6 @@
</Border> </Border>
</Grid> </Grid>
<!-- Drop shadow effect -->
<cc:Card
Title="Backdrop Type"
Margin="0 8 0 0"
Icon="&#xeb91;"
Sub="{DynamicResource shadowEffectRestart}">
<ComboBox
MinWidth="160"
VerticalAlignment="Center"
DisplayMemberPath="Display"
FontSize="14"
ItemsSource="{Binding BackdropTypesList}"
SelectedValue="{Binding BackdropType, Mode=TwoWay}"
SelectedValuePath="Value" />
</cc:Card>
<!-- Drop shadow effect -->
<cc:Card
Title="{DynamicResource queryWindowShadowEffect}"
Margin="0 8 0 0"
Icon="&#xeb91;"
Sub="{DynamicResource shadowEffectRestart}">
<ui:ToggleSwitch
IsOn="{Binding DropShadowEffect}"
OffContent="{DynamicResource disable}"
OnContent="{DynamicResource enable}" />
</cc:Card>
<!-- Theme --> <!-- Theme -->
<cc:ExCard <cc:ExCard
x:Name="ThemeCard" x:Name="ThemeCard"
@ -488,12 +458,44 @@
</ListBox.Template> </ListBox.Template>
</ListBox> </ListBox>
</cc:ExCard> </cc:ExCard>
<!-- Backdrop effect -->
<cc:Card
Title="Backdrop Type"
Margin="0 8 0 0"
Icon="&#xeb91;"
Sub="{DynamicResource shadowEffectRestart}">
<ComboBox
MinWidth="160"
VerticalAlignment="Center"
DisplayMemberPath="Display"
FontSize="14"
ItemsSource="{Binding BackdropTypesList}"
SelectedValue="{Binding BackdropType, Mode=TwoWay}"
SelectedValuePath="Value" />
</cc:Card>
<!-- Drop shadow effect -->
<cc:Card
Title="{DynamicResource queryWindowShadowEffect}"
Margin="0 8 0 0"
Icon="&#xeb91;"
Sub="{DynamicResource shadowEffectRestart}">
<ui:ToggleSwitch
IsOn="{Binding DropShadowEffect}"
OffContent="{DynamicResource disable}"
OnContent="{DynamicResource enable}" />
</cc:Card>
<cc:HyperLink <cc:HyperLink
Margin="10" Margin="10"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Text="{DynamicResource browserMoreThemes}" Text="{DynamicResource browserMoreThemes}"
Uri="{Binding LinkThemeGallery}" /> Uri="{Binding LinkThemeGallery}" />
<!-- Fixed Height --> <!-- Fixed Height -->
<cc:CardGroup Margin="0 20 0 0"> <cc:CardGroup Margin="0 20 0 0">
<cc:Card <cc:Card

6
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -1407,7 +1407,8 @@ namespace Flow.Launcher.ViewModel
// 📌 UI 요소 복원 // 📌 UI 요소 복원
mainWindow.ClockPanel.Visibility = Visibility.Visible; mainWindow.ClockPanel.Visibility = Visibility.Visible;
mainWindow.SearchIcon.Visibility = Visibility.Visible; //mainWindow.SearchIcon.Visibility = Visibility.Visible;
SearchIconVisibility = Visibility.Visible;
} }
// WPF 속성 업데이트 // WPF 속성 업데이트
@ -1439,7 +1440,8 @@ namespace Flow.Launcher.ViewModel
mainWindow.ClockPanel.Opacity = 0; mainWindow.ClockPanel.Opacity = 0;
mainWindow.SearchIcon.Opacity = 0; mainWindow.SearchIcon.Opacity = 0;
mainWindow.ClockPanel.Visibility = Visibility.Hidden; mainWindow.ClockPanel.Visibility = Visibility.Hidden;
mainWindow.SearchIcon.Visibility = Visibility.Hidden; //mainWindow.SearchIcon.Visibility = Visibility.Hidden;
SearchIconVisibility = Visibility.Hidden;
// 강제 UI 업데이트 // 강제 UI 업데이트
mainWindow.ClockPanel.UpdateLayout(); mainWindow.ClockPanel.UpdateLayout();