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.

Sign up for GitHub

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

Office 2010 and Windows8 StartScreenTabControl style and other minor fixes #249

Closed
wants to merge 5 commits into from
Closed

Office 2010 and Windows8 StartScreenTabControl style and other minor fixes #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24d8b8e
new generic StartScreenTabControl style, the old one has become the O…
maurosampietro Jan 19, 2016
3d292cb
Office2013 status bar height value is 23
maurosampietro Jan 19, 2016
ccf7ab8
Office2013 StartScreenTabControl file missing from both framework 4.0…
maurosampietro Jan 20, 2016
6de4077
Delete Margins.cs
maurosampietro Jan 20, 2016
ec79563
ns removed
maurosampietro Jan 20, 2016
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
2 changes: 1 addition & 1 deletion Fluent.Ribbon.Showcase/TestContent.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2793,7 +2793,7 @@
</TabControl>

<Fluent:StatusBar HorizontalAlignment="Stretch"
VerticalAlignment="Bottom"
VerticalAlignment="Bottom"
Visibility="{Binding IsChecked, ElementName=IsStatusBarVisibleCheckBox, Converter={StaticResource boolToVisibilityConverter}}"
Grid.Row="2">
<Fluent:StatusBarItem Title="Words Width"
Expand Down
1,556 changes: 780 additions & 776 deletions Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj
View file
Open in desktop

Large diffs are not rendered by default.

1,557 changes: 781 additions & 776 deletions Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 11 additions & 4 deletions Fluent.Ribbon/Themes/Generic/Controls/StartScreenTabControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,23 @@
Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid VerticalAlignment="Stretch"
Background="{TemplateBinding ItemsPanelBackground}">
<Grid VerticalAlignment="Stretch"
Background="{DynamicResource WindowInnerBackgroundBrush}">
<Grid.Margin>
<MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
<Binding Source="0" />
<Binding RelativeSource="{RelativeSource Self}"
Path="(Fluent:RibbonProperties.TitleBarHeight)" />
<Binding Source="0" />
<Binding Source="0" />
</MultiBinding>
</Grid.Margin>
<Border Padding="15,25">
<ContentPresenter HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Height="Auto"
Content="{TemplateBinding LeftContent}" />
</Border>
<Fluent:WindowSteeringHelperControl Height="{Binding (Fluent:RibbonProperties.TitleBarHeight), RelativeSource={RelativeSource Self}}"
VerticalAlignment="Top" />
</Grid>
<Grid Height="Auto"
Grid.Column="1"
Expand Down
7 changes: 4 additions & 3 deletions Fluent.Ribbon/Themes/Office2013/Controls/RibbonStatusBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
<Setter Property="Height"
Value="Auto" />
<Setter Property="Margin"
Value="0,0,0,-1" />
Value="0,0,0,-1" />
<Setter Property="Height"
Value="23"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Controls:StatusBar}">
<Border Height="Auto"
BorderThickness="0,1"
<Border BorderThickness="0,0"
Background="{DynamicResource RibbonThemeColorBrush}">
<ItemsPresenter x:Name="itemsPresenter"
Height="Auto" />
Expand Down
77 changes: 77 additions & 0 deletions Fluent.Ribbon/Themes/Office2013/Controls/StartScreenTabControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Fluent="clr-namespace:Fluent"
xmlns:Converters="clr-namespace:Fluent.Converters">

<ControlTemplate x:Key="StartScreenTabControlTemplate"
TargetType="{x:Type Fluent:StartScreenTabControl}">
<ControlTemplate.Resources>
<ResourceDictionary>
<Style x:Key="{x:Type ScrollBar}"
TargetType="{x:Type ScrollBar}"
BasedOn="{StaticResource ScrollBarWhite}" />
<Style x:Key="{x:Type Fluent:DropDownButton}"
TargetType="{x:Type Fluent:DropDownButton}"
BasedOn="{StaticResource DropDownButtonBackstageStyle}" />
<Style x:Key="{x:Type Fluent:ComboBox}"
TargetType="{x:Type Fluent:ComboBox}"
BasedOn="{StaticResource ComboBoxBackstageStyle}" />
<Style x:Key="{x:Type Fluent:Spinner}"
TargetType="{x:Type Fluent:Spinner}"
BasedOn="{StaticResource SpinnerBackstageStyle}" />
<Style TargetType="{x:Type Fluent:SeparatorTabItem}"
BasedOn="{StaticResource BackstageSeparatorTabItemStyle}" />
</ResourceDictionary>
</ControlTemplate.Resources>
<Grid x:Name="grid">
<Grid.ColumnDefinitions>
<ColumnDefinition MinWidth="342"
Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid VerticalAlignment="Stretch"
Background="{TemplateBinding ItemsPanelBackground}">
<Border Padding="15,25">
<ContentPresenter HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Height="Auto"
Content="{TemplateBinding LeftContent}" />
</Border>
<Fluent:WindowSteeringHelperControl Height="{Binding (Fluent:RibbonProperties.TitleBarHeight), RelativeSource={RelativeSource Self}}"
VerticalAlignment="Top" />
</Grid>
<Grid Height="Auto"
Grid.Column="1"
Background="{DynamicResource BackstageBackgroundBrush}">
<Grid.Margin>
<MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
<Binding Source="0" />
<Binding RelativeSource="{RelativeSource Self}"
Path="(Fluent:RibbonProperties.TitleBarHeight)" />
<Binding Source="0" />
<Binding Source="0" />
</MultiBinding>
</Grid.Margin>
<Border Padding="33,16"
Background="White">
<ContentPresenter x:Name="PART_SelectedContentHost"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Height="Auto"
Content="{TemplateBinding RightContent}" />
</Border>
</Grid>
</Grid>
</ControlTemplate>

<Style x:Key="StartScreenTabControlStyle"
TargetType="{x:Type Fluent:StartScreenTabControl}"
BasedOn="{StaticResource {x:Type Fluent:BackstageTabControl}}">
<Setter Property="Template"
Value="{DynamicResource StartScreenTabControlTemplate}" />
<Setter Property="Background"
Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:StartScreen}}, FallbackValue=Red}" />
<Setter Property="Margin"
Value="0" />
</Style>
</ResourceDictionary>
2 changes: 1 addition & 1 deletion Fluent.Ribbon/Themes/Office2013/Generic.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Office2013\Controls\BackstageTabItem.xaml
Office2013\Controls\BackstageControls.xaml
Office2013\Controls\BackstageTabControl.xaml
Generic\Controls\StartScreen.xaml
Generic\Controls\StartScreenTabControl.xaml
Office2013\Controls\StartScreenTabControl.xaml
Office2013\Controls\RibbonSeparator.xaml
Generic\Controls\RibbonToolBar.xaml
Generic\Controls\RibbonToolBarControlGroup.xaml
Expand Down