From ba02a3ca052c0762eb3f6b0e94b75e0788477045 Mon Sep 17 00:00:00 2001 From: DB p Date: Tue, 11 Mar 2025 12:50:37 +0900 Subject: [PATCH] Add Strings --- Flow.Launcher.Core/Resource/Theme.cs | 16 ++++++------- Flow.Launcher/Languages/en.xaml | 4 ++++ .../ViewModels/SettingsPaneThemeViewModel.cs | 24 +++++++++---------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs index 97e0f8de2..0c1cd4eca 100644 --- a/Flow.Launcher.Core/Resource/Theme.cs +++ b/Flow.Launcher.Core/Resource/Theme.cs @@ -140,12 +140,12 @@ namespace Flow.Launcher.Core.Resource if (mainWindowSrc == null) return; - //ParameterTypes.MARGINS margins = new ParameterTypes.MARGINS(); - //margins.cxLeftWidth = -1; - //margins.cxRightWidth = -1; - //margins.cyTopHeight = -1; - //margins.cyBottomHeight = -1; - //Methods.ExtendFrame(mainWindowSrc.Handle, margins); + ParameterTypes.MARGINS margins = new ParameterTypes.MARGINS(); + margins.cxLeftWidth = -1; + margins.cxRightWidth = -1; + margins.cyTopHeight = -1; + margins.cyBottomHeight = -1; + Methods.ExtendFrame(mainWindowSrc.Handle, margins); // Remove OS minimizing/maximizing animation // Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_TRANSITIONS_FORCEDISABLED, 3); @@ -578,8 +578,8 @@ namespace Flow.Launcher.Core.Resource } BlurEnabled = Win32Helper.IsBlurTheme(); - //if (_settings.UseDropShadowEffect) - // AddDropShadowEffectToCurrentTheme(); + if (_settings.UseDropShadowEffect) + AddDropShadowEffectToCurrentTheme(); diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 36a1aa2d4..9a09a4068 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -106,6 +106,10 @@ Shadow effect is not allowed while current theme has blur effect enabled The shadow effect transition takes effect after the program restarts Translucent themes cannot turn off shadow effects + None + Acrylic + Mica + Mica Alt Search Plugin diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs index 643589d68..84b71d0b4 100644 --- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs +++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs @@ -39,8 +39,8 @@ public partial class SettingsPaneThemeViewModel : BaseModel if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect == false) DropShadowEffect = true; - //ThemeManager.Instance.RefreshFrame(); - ThemeManager.Instance.SetBlurForWindow(); + ThemeManager.Instance.RefreshFrame(); + //uThemeManager.Instance.SetBlurForWindow(); } } @@ -183,17 +183,17 @@ public partial class SettingsPaneThemeViewModel : BaseModel { public void ApplyBackdrop() { - IntPtr hWnd = new WindowInteropHelper(Application.Current.MainWindow).Handle; - if (hWnd == IntPtr.Zero) - return; + //IntPtr hWnd = new WindowInteropHelper(Application.Current.MainWindow).Handle; + //if (hWnd == IntPtr.Zero) + // return; - int backdropValue = Value switch - { - BackdropTypes.Acrylic => 3, // ✅ Acrylic (DWM_SYSTEMBACKDROP_TYPE = 3) - BackdropTypes.Mica => 2, // ✅ Mica (DWM_SYSTEMBACKDROP_TYPE = 2) - BackdropTypes.MicaAlt => 4, // ✅ MicaAlt (DWM_SYSTEMBACKDROP_TYPE = 4) - _ => 0 // ✅ None (DWM_SYSTEMBACKDROP_TYPE = 0) - }; + //int backdropValue = Value switch + //{ + // BackdropTypes.Acrylic => 3, // ✅ Acrylic (DWM_SYSTEMBACKDROP_TYPE = 3) + // BackdropTypes.Mica => 2, // ✅ Mica (DWM_SYSTEMBACKDROP_TYPE = 2) + // BackdropTypes.MicaAlt => 4, // ✅ MicaAlt (DWM_SYSTEMBACKDROP_TYPE = 4) + // _ => 0 // ✅ None (DWM_SYSTEMBACKDROP_TYPE = 0) + //}; ThemeManager.Instance.SetBlurForWindow(); //Methods.SetWindowAttribute(hWnd, ParameterTypes.DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, backdropValue); }