Skip to content

Commit 17b15d9

Browse files
unitycoderunitycoder
committed
add placeholder/hint text for searchbox, grid row mouseover color opacity, add appearing clear seach button, add alt-shortcut keys for main buttons
1 parent aa3fe76 commit 17b15d9

File tree

2 files changed

+64
-11
lines changed

2 files changed

+64
-11
lines changed

‎UnityLauncherPro/MainWindow.xaml

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Title="UnityLauncherPro" Height="600" Width="500" WindowStartupLocation="CenterScreen" Background="#FF121212" MinWidth="500" MinHeight="300" WindowStyle="None" ResizeMode="CanResizeWithGrip" AllowsTransparency="True">
99

1010
<Window.Resources>
11+
1112
<!-- tabs -->
1213
<Style x:Key="TabItemStyle1" TargetType="{x:Type TabItem}">
1314
<Setter Property="Template">
@@ -54,7 +55,7 @@
5455
<Setter Property="BorderThickness" Value="0,0,0,0" />
5556
<Style.Triggers>
5657
<Trigger Property="IsMouseOver" Value="True">
57-
<Setter Property="Background" Value="#FF007ACC"/>
58+
<Setter Property="Background" Value="#B2007ACC"/>
5859
<Setter Property="Foreground" Value="White"/>
5960
</Trigger>
6061
<Trigger Property="IsSelected" Value="True">
@@ -238,10 +239,13 @@
238239
</Style.Triggers>
239240
</Style>
240241

242+
<BooleanToVisibilityConverter x:Key="MyBoolToVisibilityConverter" />
243+
241244
</Window.Resources>
242245

243246

244247
<!-- UI -->
248+
245249
<Grid Margin="0">
246250
<Grid.RowDefinitions>
247251
<RowDefinition Height="23" />
@@ -254,21 +258,45 @@
254258
<Rectangle Fill="#FF0C0C0C" MouseDown="OnRectangleMouseDown" />
255259
<Image Source="Images/icon.png" RenderOptions.BitmapScalingMode="NearestNeighbor" HorizontalAlignment="Left" Width="16" Height="16" Margin="4,0,0,0" SnapsToDevicePixels="True" UseLayoutRounding="True" />
256260
<Label Content="UnityLauncherPro" IsHitTestVisible="False" Margin="19,0,0,-5" Foreground="#FFB8B8B8" FontSize="12" HorizontalAlignment="Left" />
261+
<!-- minimize -->
257262
<Button Name="btnMinimize" BorderThickness="0" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="23" Width="23" Background="Transparent" Click="BtnMinimize_Click" Margin="0,0,27,0" Padding="2,0,2,8">
258263
<TextBlock Text="–" FontSize="15" Foreground="#FFC3C3C3" Padding="0" Height="23" HorizontalAlignment="Center"/>
259264
</Button>
265+
<!-- close -->
260266
<Button Name="btnClose" BorderThickness="0" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="23" Width="23" Background="Transparent" Click="BtnClose_Click" Padding="0,2">
261267
<TextBlock Text="❌" FontSize="10" Foreground="#FFC3C3C3" Padding="5,3,4,4" HorizontalAlignment="Center" />
262268
</Button>
263269
</Grid>
264270

265-
<!-- main content : tabbar -->
271+
<!-- main content : Tabs -->
266272
<TabControl Grid.Row="1" x:Name="tabControl" Background="#FF262626" BorderBrush="{x:Null}" Padding="0" Margin="0">
273+
<!-- Tab: Projects-->
267274
<TabItem Header="Projects" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black">
268275
<Grid>
269-
<TextBox x:Name="SearchTermTextBox" Height="19" TextWrapping="Wrap" Width="230" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="8,6,0,0" Background="#FF333337" Foreground="Gainsboro" BorderBrush="#FF434346" TextChanged="OnSearchTextChanged" PreviewKeyDown="OnSearchPreviewKeyDown"/>
276+
<!-- search box -->
277+
<Grid Background="#FF333337" HorizontalAlignment="Left" VerticalAlignment="Top" Width="222" Margin="6,5,0,0" Height="20" >
278+
<TextBlock Margin="3,2" MinWidth="100" Text="Search" Foreground="#7F919191" Visibility="{Binding ElementName=txtSearchBox, Path=Text.IsEmpty, Converter={StaticResource MyBoolToVisibilityConverter}}" Height="24" />
279+
<TextBox MinWidth="100" CaretBrush="#FFE2E2E2" Name="txtSearchBox" Background="Transparent" BorderBrush="{x:Null}" Foreground="#FFC7C7C7" SelectionBrush="#FF003966" BorderThickness="0" Margin="2,2,0,0" UndoLimit="64" />
280+
<Button Name="btnClearSearch" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" BorderThickness="0" HorizontalAlignment="Right" VerticalAlignment="Top" Height="23" Width="23" Background="Transparent" Padding="0,2" Visibility="Visible" BorderBrush="{x:Null}">
281+
<TextBlock Text="❌" FontSize="8" Foreground="#FFC3C3C3" Padding="5,3,4,4" HorizontalAlignment="Center">
282+
<TextBlock.Style>
283+
<Style TargetType="TextBlock">
284+
<Style.Triggers>
285+
<DataTrigger Binding="{Binding ElementName=txtSearchBox, Path=Text}" Value="">
286+
<Setter Property="Visibility" Value="Hidden"/>
270287

271-
<TextBlock IsHitTestVisible="False" Text="Search" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0" Foreground="#FF707070" Height="29" Padding="12,6.5,0,0">
288+
</DataTrigger>
289+
<DataTrigger Binding="{Binding ElementName=txtSearchBox, Path=Text}" Value="{x:Null}">
290+
<Setter Property="Visibility" Value="Hidden"/>
291+
</DataTrigger>
292+
</Style.Triggers>
293+
</Style>
294+
</TextBlock.Style>
295+
</TextBlock>
296+
</Button>
297+
</Grid>
298+
299+
<!--<TextBlock IsHitTestVisible="False" Text="Search" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0" Foreground="#FF707070" Height="29" Padding="12,6.5,0,0">
272300
<TextBlock.Style>
273301
<Style TargetType="{x:Type TextBlock}">
274302
<Setter Property="Visibility" Value="Collapsed"/>
@@ -279,12 +307,12 @@
279307
</Style.Triggers>
280308
</Style>
281309
</TextBlock.Style>
282-
</TextBlock>
310+
</TextBlock>-->
283311

284312
<Button Style="{StaticResource CustomButton}" ToolTip="Add existing project" x:Name="btnAddProjectFolder" Content="Add Project.." Height="22" Width="78" HorizontalAlignment="Right" VerticalAlignment="Top" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="0,4,34,0" Click="BtnAddProjectFolder_Click" BorderBrush="{x:Null}" />
285313
<Button Style="{StaticResource CustomButton}" ToolTip="Refresh list (F5)" x:Name="btnRefreshProjectList" Content="⟳" Height="22" Width="22" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="0,4,3,0" Padding="1,-2,1,1" BorderBrush="{x:Null}"/>
286314

287-
<DataGrid x:Name="dataGrid" SelectionMode="Single" Margin="0,30,0,42" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="#FFD8D8D8" HorizontalGridLinesBrush="#4C000000" VerticalGridLinesBrush="#19000000">
315+
<DataGrid x:Name="dataGrid" SelectionMode="Single" Margin="4,30,2,42" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="#FFD8D8D8" HorizontalGridLinesBrush="#4C000000" VerticalGridLinesBrush="#19000000">
288316

289317
<DataGrid.Columns>
290318
<DataGridTextColumn Binding="{Binding Title}" ClipboardContentBinding="{x:Null}" Header="Project" IsReadOnly="True" MinWidth="123"/>
@@ -342,16 +370,34 @@
342370
<Grid.RowDefinitions>
343371
<RowDefinition Height="32" />
344372
</Grid.RowDefinitions>
345-
<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnUpgradeProject" Content="Upgrade" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="5,0,0,0" BorderBrush="{x:Null}" />
346-
<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnLaunchUnity" Content="Run Unity" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" />
347-
<Button Grid.Column="2" Style="{StaticResource CustomButton}" x:Name="btnLaunchProject" Content="Open Project" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" />
348-
<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnExplore" Content="Explore" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" />
373+
<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnUpgradeProject" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="5,0,0,0" BorderBrush="{x:Null}">
374+
<Label Foreground="#FFC1C1C1">_Upgrade</Label>
375+
</Button>
376+
<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnLaunchUnity" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" >
377+
<Label Foreground="#FFC1C1C1">_Run Unity</Label>
378+
</Button>
379+
380+
<Button Grid.Column="2" Style="{StaticResource CustomButton}" x:Name="btnLaunchProject" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" >
381+
<Label Foreground="#FFC1C1C1">_Open Project</Label>
382+
</Button>
383+
384+
<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnExplore" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" >
385+
<Label Foreground="#FFC1C1C1">_Explore</Label>
386+
</Button>
387+
349388
</Grid>
350389
</Grid>
351390
</TabItem>
352-
<TabItem Header="Unitys" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
391+
392+
<!-- Tab: Unitys -->
393+
<TabItem Header="Unitys" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black"/>
394+
<!-- Tab: Packages -->
353395
<TabItem Header="Packages" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
396+
<!-- Tab: Updates -->
354397
<TabItem Header="Updates" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
398+
<!-- Tab: Tools -->
399+
<TabItem Header="Tools" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
400+
<!-- Tab: Settings -->
355401
<TabItem Header="Settings" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
356402
</TabControl>
357403

@@ -361,5 +407,7 @@
361407
</StatusBar>
362408
</Grid>
363409

410+
411+
364412
</Grid>
365413
</Window>

‎UnityLauncherPro/MainWindow.xaml.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,10 @@ private void BtnMinimize_Click(object sender, RoutedEventArgs e)
128128
notifyIcon.Visible = true;
129129
this.Hide();
130130
}
131+
132+
private void TestButton(object sender, RoutedEventArgs e)
133+
{
134+
MessageBox.Show("Click!");
135+
}
131136
}
132137
}

0 commit comments

Comments
 (0)