Skip to content

Commit aabe967

Browse files
committed
Adjust Dropshadow control disable
1 parent ea5b3f1 commit aabe967

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@ public Theme.ThemeData SelectedTheme
3939

4040
if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect == false)
4141
DropShadowEffect = true;
42+
OnPropertyChanged(nameof(IsDropShadowEnabled));
4243
ThemeManager.Instance.RefreshFrame();
4344
//uThemeManager.Instance.SetBlurForWindow();
4445
}
4546
}
4647
public bool IsBackdropEnabled => SelectedTheme?.HasBlur ?? false;
48+
public bool IsDropShadowEnabled => !ThemeManager.Instance.BlurEnabled;
4749

4850
public bool DropShadowEffect
4951
{
@@ -52,7 +54,6 @@ public bool DropShadowEffect
5254
{
5355
if (ThemeManager.Instance.BlurEnabled && value == false)
5456
{
55-
App.API.ShowMsgBox(InternationalizationManager.Instance.GetTranslation("shadowEffectNotAllowedBlur"));
5657
Settings.UseDropShadowEffect = true;
5758
return;
5859
}
@@ -223,11 +224,15 @@ public BackdropTypes BackdropType
223224
// ✅ BackdropTypeData 리스트에서 해당하는 값 찾기
224225
var backdropData = BackdropTypesList.FirstOrDefault(b => b.Value == value);
225226
backdropData?.ApplyBackdrop();
227+
228+
// ✅ DropShadow 활성화 여부 갱신
229+
OnPropertyChanged(nameof(IsDropShadowEnabled));
226230
}
227231
}
228232

229233

230234

235+
231236
public bool UseSound
232237
{
233238
get => Settings.UseSound;

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -467,15 +467,15 @@
467467
Sub="{DynamicResource shadowEffectRestart}">
468468

469469
<ComboBox
470-
MinWidth="160"
471-
VerticalAlignment="Center"
472-
DisplayMemberPath="Display"
473-
FontSize="14"
474-
ItemsSource="{Binding BackdropTypesList}"
475-
SelectedValue="{Binding BackdropType, Mode=TwoWay}"
476-
SelectedValuePath="Value"
477-
IsEnabled="{Binding IsBackdropEnabled}" />
478-
<!-- ✅ 추가 -->
470+
MinWidth="160"
471+
VerticalAlignment="Center"
472+
DisplayMemberPath="Display"
473+
FontSize="14"
474+
IsEnabled="{Binding IsBackdropEnabled}"
475+
ItemsSource="{Binding BackdropTypesList}"
476+
SelectedValue="{Binding BackdropType, Mode=TwoWay}"
477+
SelectedValuePath="Value" />
478+
<!-- ✅ 추가 -->
479479
</cc:Card>
480480

481481

@@ -486,6 +486,7 @@
486486
Icon="&#xeb91;"
487487
Sub="{DynamicResource shadowEffectRestart}">
488488
<ui:ToggleSwitch
489+
IsEnabled="{Binding IsDropShadowEnabled}"
489490
IsOn="{Binding DropShadowEffect}"
490491
OffContent="{DynamicResource disable}"
491492
OnContent="{DynamicResource enable}" />

0 commit comments

Comments
 (0)