Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Vista Classic multi-row clock, add System Vista (#718) #969

Merged
merged 1 commit into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions RetroBar/Themes/System Vista.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="System XP.xaml" />
</ResourceDictionary.MergedDictionaries>

<BitmapImage x:Key="StartIconImage"
UriSource="../Resources/startvistaclassic.png" />

<ToolTip x:Key="StartButtonTip"
Content="{DynamicResource start_button_tip_vista}" />

<Style TargetType="Image"
x:Key="StartIcon"
BasedOn="{StaticResource StartIcon}">
<Setter Property="Margin"
Value="-2,0,1,0" />
</Style>

<Style TargetType="TextBlock"
x:Key="StartLabel"
BasedOn="{StaticResource StartLabel}">
<Setter Property="Margin"
Value="0,0,0,1" />
</Style>
</ResourceDictionary>
30 changes: 2 additions & 28 deletions RetroBar/Themes/Windows Vista Classic.xaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Windows XP Classic.xaml" />
<ResourceDictionary Source="Windows 2000.xaml" />
<ResourceDictionary Source="System Vista.xaml" />
</ResourceDictionary.MergedDictionaries>

<BitmapImage x:Key="StartIconImage"
UriSource="../Resources/startvistaclassic.png" />

<ToolTip x:Key="StartButtonTip"
Content="{DynamicResource start_button_tip_vista}" />

<Style TargetType="Image"
x:Key="StartIcon"
BasedOn="{StaticResource StartIcon}">
<Setter Property="Margin"
Value="-2,0,1,0" />
</Style>

<Style TargetType="TextBlock"
x:Key="StartLabel"
BasedOn="{StaticResource StartLabel}">
<Setter Property="Margin"
Value="0,0,0,1" />
</Style>

<Style TargetType="TextBlock"
x:Key="Clock"
BasedOn="{StaticResource Clock}">
<Setter Property="Margin"
Value="3,-1,5,0" />
</Style>
</ResourceDictionary>