Skip to content

Commit de8c8bd

Browse files
committed
Fix Separator Trigger
Fix Resized trigger When Window Move
1 parent 852dcc7 commit de8c8bd

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
lines changed

Flow.Launcher/MainWindow.xaml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,22 @@
344344
<ContentControl>
345345
<ContentControl.Style>
346346
<Style TargetType="ContentControl">
347-
<Setter Property="Visibility" Value="Collapsed" />
347+
<Setter Property="Visibility" Value="Visible" />
348348
<Style.Triggers>
349+
<MultiDataTrigger>
350+
<MultiDataTrigger.Conditions>
351+
<Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
352+
<Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
353+
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
354+
</MultiDataTrigger.Conditions>
355+
<MultiDataTrigger.Setters>
356+
<Setter Property="Visibility" Value="Collapsed" />
357+
<Setter Property="Margin" Value="0" />
358+
<Setter Property="Height" Value="0" />
359+
</MultiDataTrigger.Setters>
360+
</MultiDataTrigger>
361+
</Style.Triggers>
362+
<!--<Style.Triggers>
349363
<DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
350364
<Setter Property="Visibility" Value="Visible" />
351365
</DataTrigger>
@@ -355,7 +369,7 @@
355369
<DataTrigger Binding="{Binding ElementName=History, Path=Visibility}" Value="Visible">
356370
<Setter Property="Visibility" Value="Visible" />
357371
</DataTrigger>
358-
</Style.Triggers>
372+
</Style.Triggers>-->
359373
</Style>
360374
</ContentControl.Style>
361375
<Rectangle
@@ -428,6 +442,7 @@
428442
<GridSplitter
429443
Grid.Column="1"
430444
Width="{Binding PreviewVisible, Converter={StaticResource SplitterConverter}}"
445+
Margin="0"
431446
HorizontalAlignment="Center"
432447
VerticalAlignment="Stretch"
433448
Background="Transparent"

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,26 @@ public MainWindow()
8585

8686
private const int WM_ENTERSIZEMOVE = 0x0231;
8787
private const int WM_EXITSIZEMOVE = 0x0232;
88+
private int _initialWidth;
89+
private int _initialHeight;
8890
private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
8991
{
9092
if (msg == WM_ENTERSIZEMOVE)
9193
{
94+
_initialWidth = (int)Width;
95+
_initialHeight = (int)Height;
9296
handled = true;
9397
}
9498
if (msg == WM_EXITSIZEMOVE)
9599
{
96-
OnResizeEnd();
100+
if ( _initialHeight != (int)Height)
101+
{
102+
OnResizeEnd();
103+
}
104+
if (_initialWidth != (int)Width)
105+
{
106+
FlowMainWindow.SizeToContent = SizeToContent.Height;
107+
}
97108
handled = true;
98109
}
99110
return IntPtr.Zero;
@@ -120,9 +131,8 @@ private void OnResizeEnd()
120131
_settings.MaxResultsToShow = Convert.ToInt32(Math.Truncate(itemCount));
121132
}
122133
}
123-
124-
_viewModel.MainWindowWidth = Width;
125134
FlowMainWindow.SizeToContent = SizeToContent.Height;
135+
_viewModel.MainWindowWidth = Width;
126136
}
127137

128138
private void OnCopy(object sender, ExecutedRoutedEventArgs e)

0 commit comments

Comments
 (0)