Skip to content

Commit aaca0c0

Browse files
committed
Change Comment to english
1 parent 4731d88 commit aaca0c0

File tree

2 files changed

+35
-41
lines changed

2 files changed

+35
-41
lines changed

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -845,28 +845,28 @@ private void UpdateClockPanelVisibility()
845845

846846
var animationDuration = TimeSpan.FromMilliseconds(animationLength * 2 / 3);
847847

848-
// ✅ ClockPanel이 표시될 조건 (쿼리 입력 없음 & ContextMenu, History가 닫혀 있음)
848+
// ✅ Conditions for showing ClockPanel (No query input & ContextMenu, History are closed)
849849
bool shouldShowClock = QueryTextBox.Text.Length == 0 &&
850850
ContextMenu.Visibility != Visibility.Visible &&
851851
History.Visibility != Visibility.Visible;
852852

853-
// ✅ 1. ContextMenu가 열리면 즉시 Visibility.Hidden으로 설정 (애니메이션 없이 강제 숨김)
853+
// ✅ 1. When ContextMenu opens, immediately set Visibility.Hidden (force hide without animation)
854854
if (ContextMenu.Visibility == Visibility.Visible)
855855
{
856856
ClockPanel.Visibility = Visibility.Hidden;
857-
ClockPanel.Opacity = 0.0; // 혹시라도 Opacity 애니메이션이 영향을 줄 경우 0으로 설정
857+
ClockPanel.Opacity = 0.0; // Set to 0 in case Opacity animation affects it
858858
return;
859859
}
860860

861-
// ✅ 2. ContextMenu가 닫혔을 때, 쿼리에 글자가 남아 있다면 Hidden 상태 유지 (이전 상태 기억)
861+
// ✅ 2. When ContextMenu is closed, keep it Hidden if there's text in the query (remember previous state)
862862
if (ContextMenu.Visibility != Visibility.Visible && QueryTextBox.Text.Length > 0)
863863
{
864864
ClockPanel.Visibility = Visibility.Hidden;
865865
ClockPanel.Opacity = 0.0;
866866
return;
867867
}
868868

869-
// ✅ 3. ClockPanel을 숨기는 경우 (페이드아웃 애니메이션 적용)
869+
// ✅ 3. When hiding ClockPanel (apply fade-out animation)
870870
if ((!shouldShowClock) && ClockPanel.Visibility == Visibility.Visible && !_isClockPanelAnimating)
871871
{
872872
_isClockPanelAnimating = true;
@@ -881,20 +881,20 @@ private void UpdateClockPanelVisibility()
881881

882882
fadeOut.Completed += (s, e) =>
883883
{
884-
ClockPanel.Visibility = Visibility.Hidden; // ✅ 애니메이션 후 완전히 숨김
884+
ClockPanel.Visibility = Visibility.Hidden; // ✅ Completely hide after animation
885885
_isClockPanelAnimating = false;
886886
};
887887

888888
ClockPanel.BeginAnimation(OpacityProperty, fadeOut);
889889
}
890-
// ✅ 4. ClockPanel을 표시하는 경우 (페이드인 애니메이션 적용)
890+
// ✅ 4. When showing ClockPanel (apply fade-in animation)
891891
else if (shouldShowClock && ClockPanel.Visibility != Visibility.Visible && !_isClockPanelAnimating)
892892
{
893893
_isClockPanelAnimating = true;
894894

895895
Application.Current.Dispatcher.Invoke(() =>
896896
{
897-
ClockPanel.Visibility = Visibility.Visible; // ✅ Visibility를 먼저 Visible로 설정
897+
ClockPanel.Visibility = Visibility.Visible; // ✅ Set Visibility to Visible first
898898

899899
var fadeIn = new DoubleAnimation
900900
{
@@ -910,6 +910,7 @@ private void UpdateClockPanelVisibility()
910910
}
911911
}
912912

913+
913914
private static double GetOpacityFromStyle(Style style, double defaultOpacity = 1.0)
914915
{
915916
if (style == null)

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,28 +1368,28 @@ public void ToggleFlowLauncher()
13681368
}
13691369

13701370
public void Show()
1371+
{
1372+
Application.Current.Dispatcher.Invoke(() =>
1373+
{
1374+
if (Application.Current.MainWindow is MainWindow mainWindow)
13711375
{
1372-
Application.Current.Dispatcher.Invoke(() =>
1373-
{
1374-
if (Application.Current.MainWindow is MainWindow mainWindow)
1375-
{
1376-
// 📌 DWM Cloak 해제 (창을 정상적으로 표시)
1377-
Win32Helper.DWMSetCloakForWindow(mainWindow, false);
1378-
1379-
// 📌 UI 요소 복원
1380-
mainWindow.ClockPanel.Visibility = Visibility.Visible;
1381-
//mainWindow.SearchIcon.Visibility = Visibility.Visible;
1382-
SearchIconVisibility = Visibility.Visible;
1383-
}
1376+
// 📌 Remove DWM Cloak (Make the window visible normally)
1377+
Win32Helper.DWMSetCloakForWindow(mainWindow, false);
13841378

1385-
// WPF 속성 업데이트
1386-
MainWindowVisibility = Visibility.Visible;
1387-
MainWindowOpacity = 1;
1388-
MainWindowVisibilityStatus = true;
1389-
VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = true });
1390-
});
1379+
// 📌 Restore UI elements
1380+
mainWindow.ClockPanel.Visibility = Visibility.Visible;
1381+
//mainWindow.SearchIcon.Visibility = Visibility.Visible;
1382+
SearchIconVisibility = Visibility.Visible;
13911383
}
13921384

1385+
// Update WPF properties
1386+
MainWindowVisibility = Visibility.Visible;
1387+
MainWindowOpacity = 1;
1388+
MainWindowVisibilityStatus = true;
1389+
VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = true });
1390+
});
1391+
}
1392+
13931393
#pragma warning disable VSTHRD100 // Avoid async void methods
13941394

13951395
public async void Hide()
@@ -1406,14 +1406,14 @@ public async void Hide()
14061406
SelectedResults = Results;
14071407
}
14081408

1409-
// 📌 텍스트 초기화 즉시 적용 + UI 강제 업데이트
1409+
// 📌 Immediately apply text reset + force UI update
14101410
if (Settings.LastQueryMode == LastQueryMode.Empty)
14111411
{
14121412
ChangeQueryText(string.Empty);
1413-
await Task.Delay(1); // 한 프레임 후 UI가 반영되도록 대기
1413+
await Task.Delay(1); // Wait for one frame to ensure UI reflects changes
14141414
Application.Current.Dispatcher.Invoke(() =>
14151415
{
1416-
Application.Current.MainWindow.UpdateLayout(); // UI 강제 업데이트
1416+
Application.Current.MainWindow.UpdateLayout(); // Force UI update
14171417
});
14181418
}
14191419

@@ -1436,17 +1436,9 @@ public async void Hide()
14361436
break;
14371437
}
14381438

1439-
//if (Application.Current.MainWindow is MainWindow mainWindow2)
1440-
//{
1441-
// IntPtr hWnd = new WindowInteropHelper(mainWindow2).Handle;
1442-
1443-
// // 📌 Cloak을 사용하지 않고 일반적인 `ShowWindow(SW_HIDE)` 사용 → Mica/Acrylic 유지됨
1444-
// ShowWindow(hWnd, SW_HIDE);
1445-
//}
1446-
14471439
if (Application.Current.MainWindow is MainWindow mainWindow)
14481440
{
1449-
// 📌 아이콘과 시계 Opacity를 0으로 설정하고 Visibility.Hidden 적용
1441+
// 📌 Set Opacity of icon and clock to 0 and apply Visibility.Hidden
14501442
Application.Current.Dispatcher.Invoke(() =>
14511443
{
14521444
mainWindow.ClockPanel.Opacity = 0;
@@ -1455,23 +1447,24 @@ public async void Hide()
14551447
//mainWindow.SearchIcon.Visibility = Visibility.Hidden;
14561448
SearchIconVisibility = Visibility.Hidden;
14571449

1458-
// 강제 UI 업데이트
1450+
// Force UI update
14591451
mainWindow.ClockPanel.UpdateLayout();
14601452
mainWindow.SearchIcon.UpdateLayout();
14611453
}, DispatcherPriority.Render);
14621454

1463-
// 📌 DWM Cloak 적용 (창을 완전히 숨김)
1455+
// 📌 Apply DWM Cloak (Completely hide the window)
14641456
Win32Helper.DWMSetCloakForWindow(mainWindow, true);
14651457
}
14661458

14671459
await Task.Delay(50);
1468-
// WPF 속성 업데이트
1460+
// Update WPF properties
14691461
//MainWindowOpacity = 0;
14701462
MainWindowVisibilityStatus = false;
14711463
MainWindowVisibility = Visibility.Collapsed;
14721464
VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = false });
14731465
}
14741466

1467+
14751468
#pragma warning restore VSTHRD100 // Avoid async void methods
14761469

14771470
/// <summary>

0 commit comments

Comments
 (0)