Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,14 @@
<a name="xamlPropertyElementUsage_Bullet"></a>
## XAML Property Element Usage

```
```xaml
<object>
<object.Bullet>
<UIElement .../>
</object.Bullet>
</object>
```



## Examples
The following examples show how to set the <xref:System.Windows.Controls.Primitives.BulletDecorator.Bullet%2A> property.

Expand Down
12 changes: 6 additions & 6 deletions xml/System.Windows.Controls.Primitives/ButtonBase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@
<a name="xamlAttributeUsage_Command"></a>
## XAML Attribute Usage

```
<object Command="commandName"/>
```xaml
<object Command="commandName"/>
```

<a name="xamlValues_Command"></a>
Expand Down Expand Up @@ -382,8 +382,8 @@
<a name="xamlAttributeUsage_CommandParameter"></a>
## XAML Attribute Usage

```
<object CommandParameter="commandParameter" />
```xaml
<object CommandParameter="commandParameter" />
```

<a name="xamlValues_CommandParameter"></a>
Expand Down Expand Up @@ -502,8 +502,8 @@
<a name="xamlAttributeUsage_Target"></a>
## XAML Attribute Usage

```
<ButtonBase CommandTarget="{Binding ElementName= elementName }"/>
```xaml
<ButtonBase CommandTarget="{Binding ElementName= elementName }"/>
```

<a name="xamlValues_CommandTarget"></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
<a name="xamlAttributeUsage_Columns"></a>
## XAML Attribute Usage

```
<object Columns="{ResourceExtension ColumnsKey}"/>
```xaml
<object Columns="{ResourceExtension ColumnsKey}"/>
```

<a name="xamlValues_Columns"></a>
Expand Down
12 changes: 6 additions & 6 deletions xml/System.Windows.Controls.Primitives/Popup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -669,10 +669,10 @@
<a name="xamlAttributeUsage_HorizontalOffset"></a>
## XAML Attribute Usage

```
<object HorizontalOffset="double"/>
```xaml
<object HorizontalOffset="double"/>
- or -
<object HorizontalOffset="qualifiedDouble"/>
<object HorizontalOffset="qualifiedDouble"/>
```

<a name="xamlValues_HorizontallOffset"></a>
Expand Down Expand Up @@ -1743,10 +1743,10 @@
<a name="xamlAttributeUsage_VerticalOffset"></a>
## XAML Attribute Usage

```
<object VerticalOffset="double"/>
```xaml
<object VerticalOffset="double"/>
- or -
<object VerticalOffset="qualifiedDouble"/>
<object VerticalOffset="qualifiedDouble"/>
```

<a name="xamlValues_VerticalOffset"></a>
Expand Down
4 changes: 2 additions & 2 deletions xml/System.Windows.Controls.Primitives/RangeBase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,8 @@
<a name="xamlAttributeUsage_ValueChanged"></a>
## XAML Attribute Usage

```
<object ValueChanged="RoutedPropertyChangedEventHandler"/>
```xaml
<object ValueChanged="RoutedPropertyChangedEventHandler"/>
```

]]></format>
Expand Down
4 changes: 2 additions & 2 deletions xml/System.Windows.Controls.Primitives/StatusBar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,8 @@
<a name="xamlAttributeUsage_SeparatorStyleKey"></a>
## XAML Attribute Usage

```
<object x:Key="{x:Static StatusBar.SeparatorStyleKey}"/>
```xaml
<object x:Key="{x:Static StatusBar.SeparatorStyleKey}"/>
```

]]></format>
Expand Down
34 changes: 16 additions & 18 deletions xml/System.Windows.Controls.Ribbon/Ribbon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,18 @@
```xaml
xmlns:ribbon="clr-namespace:System.Windows.Controls.Ribbon;assembly=RibbonControlsLibrary"
...
<ribbon:Ribbon >
    <ribbon:Ribbon.ApplicationMenu>
        <ribbon:RibbonApplicationMenu SmallImageSource="Images\SmallIcon.png">
            <ribbon:RibbonApplicationMenuItem Header="Hello _Ribbon"
                                              x:Name="MenuItem1"
                                              ImageSource="Images\LargeIcon.png"/>
        </ribbon:RibbonApplicationMenu>
    </ribbon:Ribbon.ApplicationMenu>
    <ribbon:RibbonTab>
<ribbon:Ribbon>
<ribbon:Ribbon.ApplicationMenu>
<ribbon:RibbonApplicationMenu SmallImageSource="Images\SmallIcon.png">
<ribbon:RibbonApplicationMenuItem Header="Hello _Ribbon"
x:Name="MenuItem1"
ImageSource="Images\LargeIcon.png"/>
</ribbon:RibbonApplicationMenu>
</ribbon:Ribbon.ApplicationMenu>
<ribbon:RibbonTab>
<!-- Ribbon content goes here. -->
    </ribbon:RibbonTab>
</ribbon:Ribbon >

</ribbon:RibbonTab>
</ribbon:Ribbon>
```

]]></format>
Expand Down Expand Up @@ -519,14 +518,13 @@ xmlns:ribbon="clr-namespace:System.Windows.Controls.Ribbon;assembly=RibbonContro

```xaml
</ribbon:Ribbon>
    <ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
<ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
<!-- Ribbon Tab Content -->
    </ribbon:RibbonTab>
    <ribbon:Ribbon.ContextualTabGroups>
        <ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
    </ribbon:Ribbon.ContextualTabGroups>
</ribbon:RibbonTab>
<ribbon:Ribbon.ContextualTabGroups>
<ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
</ribbon:Ribbon.ContextualTabGroups>
</ribbon:Ribbon>

```

]]></format>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,18 @@
## Remarks
You use a *contextual tab* to display groups of commands that are relevant only in a particular context. Contextual tab groups are shown or hidden based on specified criteria. For example, an Ink Tools tab group might be shown when tablet input is detected, or a Picture Tools tab group might be shown when an Image object is selected.



## Examples
The following example shows a <xref:System.Windows.Controls.Ribbon.RibbonTab> named **Pens** that is in the **Ink Tools** contextual tab group.

```xaml
</ribbon:Ribbon>
    <ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
<ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
<!-- Ribbon Tab Content -->
    </ribbon:RibbonTab>
    <ribbon:Ribbon.ContextualTabGroups>
        <ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
    </ribbon:Ribbon.ContextualTabGroups>
</ribbon:RibbonTab>
<ribbon:Ribbon.ContextualTabGroups>
<ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
</ribbon:Ribbon.ContextualTabGroups>
</ribbon:Ribbon>

```

]]></format>
Expand Down
22 changes: 11 additions & 11 deletions xml/System.Windows.Controls.Ribbon/RibbonGroup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -264,17 +264,17 @@

```xaml
<ribbon:RibbonGroup.GroupSizeDefinitions>
  <ribbon:RibbonGroupSizeDefinition>
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
  </ribbon:RibbonGroupSizeDefinition>
  <ribbon:RibbonGroupSizeDefinition>
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
  </ribbon:RibbonGroupSizeDefinition>
  <ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
</ribbon:RibbonGroup.GroupSizeDefinitions>
```

Expand Down
24 changes: 12 additions & 12 deletions xml/System.Windows.Controls.Ribbon/RibbonGroupSizeDefinition.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@
## Examples
The following example shows a <xref:System.Windows.Controls.Ribbon.RibbonGroup.GroupSizeDefinitions%2A> collection that specifies three different group sizes.

```
```xaml
<ribbon:RibbonGroup.GroupSizeDefinitions>
  <ribbon:RibbonGroupSizeDefinition>
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
  </ribbon:RibbonGroupSizeDefinition>
  <ribbon:RibbonGroupSizeDefinition>
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
  </ribbon:RibbonGroupSizeDefinition>
  <ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
</ribbon:RibbonGroup.GroupSizeDefinitions>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,57 +25,56 @@
<Docs>
<summary>Provides a friendly name for XAML usage of a <see cref="T:System.Windows.Controls.Ribbon.RibbonGroupSizeDefinition" /> collection.</summary>
<remarks>
<format type="text/markdown"><![CDATA[

## Remarks
Use the <xref:System.Windows.Controls.Ribbon.RibbonGroupSizeDefinitionBaseCollection> type to define a collection of <xref:System.Windows.Controls.Ribbon.RibbonGroupSizeDefinition> objects as a resource.



## Examples
The following example shows how to define a <xref:System.Windows.Controls.Ribbon.RibbonGroupSizeDefinitionBaseCollection> as a resource with the x:Key `3ControlSizeDef` and reference it from the <xref:System.Windows.Controls.Ribbon.RibbonGroup.GroupSizeDefinitions%2A> property of a <xref:System.Windows.Controls.Ribbon.RibbonGroup>.

```
xmlns:ribbon="clr-namespace:System.Windows.Controls.Ribbon;assembly=RibbonControlsLibrary"
<!-- ... -->
<ribbon:Ribbon x:Name="Ribbon">
  <ribbon:Ribbon.Resources>
    <ribbon:RibbonGroupSizeDefinitionBaseCollection x:Key="3ControlSizeDef">
      <ribbon:RibbonGroupSizeDefinition>
        <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
        <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
        <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
      </ribbon:RibbonGroupSizeDefinition>
      <ribbon:RibbonGroupSizeDefinition>
        <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
        <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
        <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
      </ribbon:RibbonGroupSizeDefinition>
      <ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
    </ribbon:RibbonGroupSizeDefinitionBaseCollection>
  </ribbon:Ribbon.Resources>

  <ribbon:RibbonTab Header="Home" >
    <ribbon:RibbonGroup Header="Clipboard" Name="Clipboard" SmallImageSource="Images/Paste16.png"
                        GroupSizeDefinitions="{StaticResource 3ControlSizeDef}">
      <ribbon:RibbonButton Label="Paste"
                         Command="ApplicationCommands.Paste"
                         SmallImageSource="Images/Paste16.png"
                         LargeImageSource="Images/Paste32.png" />
      <ribbon:RibbonButton Label="Cut"
                         Command="ApplicationCommands.Cut"
                         SmallImageSource="Images/Cut16.png"
                         LargeImageSource="Images/Cut32.png" />
      <ribbon:RibbonButton Label="Copy"
                         Command="ApplicationCommands.Copy"
                         SmallImageSource="Images/Copy16.png"
                         LargeImageSource="Images/Copy32.png" />
    </ribbon:RibbonGroup>
  </ribbon:RibbonTab>
</ribbon:Ribbon>

```

<format type="text/markdown"><![CDATA[

## Remarks
Use the <xref:System.Windows.Controls.Ribbon.RibbonGroupSizeDefinitionBaseCollection> type to define a collection of <xref:System.Windows.Controls.Ribbon.RibbonGroupSizeDefinition> objects as a resource.



## Examples
The following example shows how to define a <xref:System.Windows.Controls.Ribbon.RibbonGroupSizeDefinitionBaseCollection> as a resource with the x:Key `3ControlSizeDef` and reference it from the <xref:System.Windows.Controls.Ribbon.RibbonGroup.GroupSizeDefinitions%2A> property of a <xref:System.Windows.Controls.Ribbon.RibbonGroup>.

```xaml
xmlns:ribbon="clr-namespace:System.Windows.Controls.Ribbon;assembly=RibbonControlsLibrary"
<!-- ... -->
<ribbon:Ribbon x:Name="Ribbon">
<ribbon:Ribbon.Resources>
<ribbon:RibbonGroupSizeDefinitionBaseCollection x:Key="3ControlSizeDef">
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
</ribbon:RibbonGroupSizeDefinitionBaseCollection>
</ribbon:Ribbon.Resources>

<ribbon:RibbonTab Header="Home" >
<ribbon:RibbonGroup Header="Clipboard" Name="Clipboard" SmallImageSource="Images/Paste16.png"
GroupSizeDefinitions="{StaticResource 3ControlSizeDef}">
<ribbon:RibbonButton Label="Paste"
Command="ApplicationCommands.Paste"
SmallImageSource="Images/Paste16.png"
LargeImageSource="Images/Paste32.png" />
<ribbon:RibbonButton Label="Cut"
Command="ApplicationCommands.Cut"
SmallImageSource="Images/Cut16.png"
LargeImageSource="Images/Cut32.png" />
<ribbon:RibbonButton Label="Copy"
Command="ApplicationCommands.Copy"
SmallImageSource="Images/Copy16.png"
LargeImageSource="Images/Copy32.png" />
</ribbon:RibbonGroup>
</ribbon:RibbonTab>
</ribbon:Ribbon>
```

]]></format>
</remarks>
<related type="Article" href="https://msdn.microsoft.com/library/b9734605-83aa-4e69-b0e0-a45df7261a94">Ribbon Layout and Resizing</related>
Expand Down
17 changes: 7 additions & 10 deletions xml/System.Windows.Controls.Ribbon/RibbonQuickAccessToolBar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,31 +46,28 @@
## Remarks
You add a <xref:System.Windows.Controls.Ribbon.RibbonQuickAccessToolBar> to a <xref:System.Windows.Controls.Ribbon.Ribbon> control by specifying it as the content of the <xref:System.Windows.Controls.Ribbon.Ribbon.QuickAccessToolBar%2A?displayProperty=nameWithType> property using XAML [Property Element Syntax](/dotnet/framework/wpf/advanced/xaml-syntax-in-detail).

```
```xaml
<ribbon:Ribbon>
<ribbon:Ribbon.QuickAccessToolBar>
<ribbon:RibbonQuickAccessToolBar />
</ribbon:Ribbon.QuickAccessToolBar>
...
</ribbon:Ribbon>

```

The following list shows the typical placement of the <xref:System.Windows.Controls.Ribbon.RibbonQuickAccessToolBar> in the hierarchy of ribbon elements.

- <xref:System.Windows.Controls.Ribbon.Ribbon>

- <xref:System.Windows.Controls.Ribbon.Ribbon.QuickAccessToolBar%2A?displayProperty=nameWithType> property

- <xref:System.Windows.Controls.Ribbon.RibbonQuickAccessToolBar>
- <xref:System.Windows.Controls.Ribbon.Ribbon>

- <xref:System.Windows.Controls.Ribbon.RibbonButton>, <xref:System.Windows.Controls.Ribbon.RibbonRadioButton>, <xref:System.Windows.Controls.Ribbon.RibbonToggleButton>, <xref:System.Windows.Controls.Ribbon.RibbonCheckBox>, <xref:System.Windows.Controls.Ribbon.RibbonTextBox>
- <xref:System.Windows.Controls.Ribbon.Ribbon.QuickAccessToolBar%2A?displayProperty=nameWithType> property

- <xref:System.Windows.Controls.Ribbon.RibbonComboBox>, <xref:System.Windows.Controls.Ribbon.RibbonMenuButton>, <xref:System.Windows.Controls.Ribbon.RibbonSplitButton>
- <xref:System.Windows.Controls.Ribbon.RibbonQuickAccessToolBar>

- <xref:System.Windows.Controls.Ribbon.RibbonQuickAccessToolBar.CustomizeMenuButton%2A>
- <xref:System.Windows.Controls.Ribbon.RibbonButton>, <xref:System.Windows.Controls.Ribbon.RibbonRadioButton>, <xref:System.Windows.Controls.Ribbon.RibbonToggleButton>, <xref:System.Windows.Controls.Ribbon.RibbonCheckBox>, <xref:System.Windows.Controls.Ribbon.RibbonTextBox>

- <xref:System.Windows.Controls.Ribbon.RibbonComboBox>, <xref:System.Windows.Controls.Ribbon.RibbonMenuButton>, <xref:System.Windows.Controls.Ribbon.RibbonSplitButton>

- <xref:System.Windows.Controls.Ribbon.RibbonQuickAccessToolBar.CustomizeMenuButton%2A>

## Examples
The following example shows a simple ribbon that is created by the Visual Studio 2010 template, with help pane and Quick Access Toolbar elements added.
Expand Down
Loading