Skip to content

Commit 4fd5e15

Browse files
committed
- Adjust Setting order
- Fix Plugin Activation Icon display
1 parent f5d9155 commit 4fd5e15

File tree

3 files changed

+43
-34
lines changed

3 files changed

+43
-34
lines changed

Flow.Launcher.Core/Resource/Theme.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,17 @@ public void SetBlurForWindow()
270270
windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
271271
windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Color.FromArgb(1, 0, 0, 0)))); // 드래그 가능 투명색
272272
}
273-
else
273+
else if (_settings.BackdropType == BackdropTypes.Acrylic)
274274
{
275275
windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
276276
windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Colors.Transparent)));
277277
}
278-
278+
else
279+
{
280+
//windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
281+
//windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Colors.Transparent)));
282+
}
283+
Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, backdropValue);
279284
ThemeModeColor(BlurMode()); // ✅ 테마 모드 적용
280285
}
281286
else

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -371,36 +371,6 @@
371371
</Border>
372372
</Grid>
373373

374-
<!-- Drop shadow effect -->
375-
<cc:Card
376-
Title="Backdrop Type"
377-
Margin="0 8 0 0"
378-
Icon="&#xeb91;"
379-
Sub="{DynamicResource shadowEffectRestart}">
380-
381-
<ComboBox
382-
MinWidth="160"
383-
VerticalAlignment="Center"
384-
DisplayMemberPath="Display"
385-
FontSize="14"
386-
ItemsSource="{Binding BackdropTypesList}"
387-
SelectedValue="{Binding BackdropType, Mode=TwoWay}"
388-
SelectedValuePath="Value" />
389-
</cc:Card>
390-
391-
392-
<!-- Drop shadow effect -->
393-
<cc:Card
394-
Title="{DynamicResource queryWindowShadowEffect}"
395-
Margin="0 8 0 0"
396-
Icon="&#xeb91;"
397-
Sub="{DynamicResource shadowEffectRestart}">
398-
<ui:ToggleSwitch
399-
IsOn="{Binding DropShadowEffect}"
400-
OffContent="{DynamicResource disable}"
401-
OnContent="{DynamicResource enable}" />
402-
</cc:Card>
403-
404374
<!-- Theme -->
405375
<cc:ExCard
406376
x:Name="ThemeCard"
@@ -488,12 +458,44 @@
488458
</ListBox.Template>
489459
</ListBox>
490460
</cc:ExCard>
461+
462+
<!-- Backdrop effect -->
463+
<cc:Card
464+
Title="Backdrop Type"
465+
Margin="0 8 0 0"
466+
Icon="&#xeb91;"
467+
Sub="{DynamicResource shadowEffectRestart}">
468+
469+
<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+
</cc:Card>
478+
479+
480+
<!-- Drop shadow effect -->
481+
<cc:Card
482+
Title="{DynamicResource queryWindowShadowEffect}"
483+
Margin="0 8 0 0"
484+
Icon="&#xeb91;"
485+
Sub="{DynamicResource shadowEffectRestart}">
486+
<ui:ToggleSwitch
487+
IsOn="{Binding DropShadowEffect}"
488+
OffContent="{DynamicResource disable}"
489+
OnContent="{DynamicResource enable}" />
490+
</cc:Card>
491491
<cc:HyperLink
492492
Margin="10"
493493
HorizontalAlignment="Right"
494494
Text="{DynamicResource browserMoreThemes}"
495495
Uri="{Binding LinkThemeGallery}" />
496496

497+
498+
497499
<!-- Fixed Height -->
498500
<cc:CardGroup Margin="0 20 0 0">
499501
<cc:Card

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,8 @@ public void Show()
14071407

14081408
// 📌 UI 요소 복원
14091409
mainWindow.ClockPanel.Visibility = Visibility.Visible;
1410-
mainWindow.SearchIcon.Visibility = Visibility.Visible;
1410+
//mainWindow.SearchIcon.Visibility = Visibility.Visible;
1411+
SearchIconVisibility = Visibility.Visible;
14111412
}
14121413

14131414
// WPF 속성 업데이트
@@ -1439,7 +1440,8 @@ public async void Hide()
14391440
mainWindow.ClockPanel.Opacity = 0;
14401441
mainWindow.SearchIcon.Opacity = 0;
14411442
mainWindow.ClockPanel.Visibility = Visibility.Hidden;
1442-
mainWindow.SearchIcon.Visibility = Visibility.Hidden;
1443+
//mainWindow.SearchIcon.Visibility = Visibility.Hidden;
1444+
SearchIconVisibility = Visibility.Hidden;
14431445

14441446
// 강제 UI 업데이트
14451447
mainWindow.ClockPanel.UpdateLayout();

0 commit comments

Comments
 (0)