mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
- Adjust Setting order
- Fix Plugin Activation Icon display
This commit is contained in:
parent
f5d91550f2
commit
4fd5e1558d
3 changed files with 43 additions and 34 deletions
|
|
@ -270,12 +270,17 @@ namespace Flow.Launcher.Core.Resource
|
|||
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)))); // 드래그 가능 투명색
|
||||
}
|
||||
else
|
||||
else if (_settings.BackdropType == BackdropTypes.Acrylic)
|
||||
{
|
||||
windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
|
||||
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()); // ✅ 테마 모드 적용
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -371,36 +371,6 @@
|
|||
</Border>
|
||||
</Grid>
|
||||
|
||||
<!-- Drop shadow effect -->
|
||||
<cc:Card
|
||||
Title="Backdrop Type"
|
||||
Margin="0 8 0 0"
|
||||
Icon=""
|
||||
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=""
|
||||
Sub="{DynamicResource shadowEffectRestart}">
|
||||
<ui:ToggleSwitch
|
||||
IsOn="{Binding DropShadowEffect}"
|
||||
OffContent="{DynamicResource disable}"
|
||||
OnContent="{DynamicResource enable}" />
|
||||
</cc:Card>
|
||||
|
||||
<!-- Theme -->
|
||||
<cc:ExCard
|
||||
x:Name="ThemeCard"
|
||||
|
|
@ -488,12 +458,44 @@
|
|||
</ListBox.Template>
|
||||
</ListBox>
|
||||
</cc:ExCard>
|
||||
|
||||
<!-- Backdrop effect -->
|
||||
<cc:Card
|
||||
Title="Backdrop Type"
|
||||
Margin="0 8 0 0"
|
||||
Icon=""
|
||||
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=""
|
||||
Sub="{DynamicResource shadowEffectRestart}">
|
||||
<ui:ToggleSwitch
|
||||
IsOn="{Binding DropShadowEffect}"
|
||||
OffContent="{DynamicResource disable}"
|
||||
OnContent="{DynamicResource enable}" />
|
||||
</cc:Card>
|
||||
<cc:HyperLink
|
||||
Margin="10"
|
||||
HorizontalAlignment="Right"
|
||||
Text="{DynamicResource browserMoreThemes}"
|
||||
Uri="{Binding LinkThemeGallery}" />
|
||||
|
||||
|
||||
|
||||
<!-- Fixed Height -->
|
||||
<cc:CardGroup Margin="0 20 0 0">
|
||||
<cc:Card
|
||||
|
|
|
|||
|
|
@ -1407,7 +1407,8 @@ namespace Flow.Launcher.ViewModel
|
|||
|
||||
// 📌 UI 요소 복원
|
||||
mainWindow.ClockPanel.Visibility = Visibility.Visible;
|
||||
mainWindow.SearchIcon.Visibility = Visibility.Visible;
|
||||
//mainWindow.SearchIcon.Visibility = Visibility.Visible;
|
||||
SearchIconVisibility = Visibility.Visible;
|
||||
}
|
||||
|
||||
// WPF 속성 업데이트
|
||||
|
|
@ -1439,7 +1440,8 @@ namespace Flow.Launcher.ViewModel
|
|||
mainWindow.ClockPanel.Opacity = 0;
|
||||
mainWindow.SearchIcon.Opacity = 0;
|
||||
mainWindow.ClockPanel.Visibility = Visibility.Hidden;
|
||||
mainWindow.SearchIcon.Visibility = Visibility.Hidden;
|
||||
//mainWindow.SearchIcon.Visibility = Visibility.Hidden;
|
||||
SearchIconVisibility = Visibility.Hidden;
|
||||
|
||||
// 강제 UI 업데이트
|
||||
mainWindow.ClockPanel.UpdateLayout();
|
||||
|
|
|
|||
Loading…
Reference in a new issue