Merge branch 'hotfix/5.1.2'

WildGums · Feb 17, 2025 · c1bf464 · c1bf464
2 parents 841cf0b + ef12cdd
commit c1bf464
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/src/Orc.Controls.Example/Views/CalloutView.xaml b/src/Orc.Controls.Example/Views/CalloutView.xaml
@@ -25,7 +25,7 @@
                     Command="{Binding OpenCallout}" />
 
             <orccontrols:Callout x:Name="buttonCallout"
-                                 Title="Print Button."
+                                 Title="Print Button with a very long title."
                                  Description="This is a print button."
                                  TailBaseWidth="{Binding Value, ElementName=TailBaseWidthNumericTextBox}"
                                  Placement="{Binding SelectedValue, ElementName=PlacementCombobox}"

diff --git a/src/Orc.Controls.Example/Views/FontSizeSelectorWindow.xaml b/src/Orc.Controls.Example/Views/FontSizeSelectorWindow.xaml
@@ -6,6 +6,7 @@
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:local="clr-namespace:Orc.Controls.Example.Views"
                    xmlns:orctheming="http://schemas.wildgums.com/orc/theming"
+                   ShowInTaskbar="True"
                    mc:Ignorable="d">
     <Grid>
         <orctheming:FontSizeSwitcherView />

diff --git a/src/Orc.Controls.Example/Views/MainWindow.xaml b/src/Orc.Controls.Example/Views/MainWindow.xaml
@@ -19,7 +19,7 @@
 
             <orctheming:ThemeSwitcherView Grid.Row="0" />
 
-            <orccontrols:Callout Title="Looking for callouts?"
+            <orccontrols:Callout Title="Looking for callouts with a very very very very long title?"
                                  CalloutName="ExampleCallout"
                                  Description="Example callout with a specified delay. Check the callout tab below.
                              

diff --git a/src/Orc.Controls/Controls/Callout/Views/Callout.xaml b/src/Orc.Controls/Controls/Callout/Views/Callout.xaml
@@ -296,26 +296,34 @@
                             </Grid.RowDefinitions>
 
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" MaxWidth="280" />
+                                <!-- 16 + margin -->
+                                <ColumnDefinition Width="20" MaxWidth="20" />
                             </Grid.ColumnDefinitions>
 
                             <TextBlock Grid.Row="0"
+                                       MaxWidth="280"
                                        Text="{Binding Title}"
                                        FontSize="{orctheming:FontSize 14}"
                                        FontWeight="Medium"
+                                       TextTrimming="CharacterEllipsis"
                                        Foreground="{DynamicResource Orc.Brushes.Control.Default.Foreground}"
-                                       HorizontalAlignment="Left" />
+                                       HorizontalAlignment="Left"
+                                       Background="Transparent"
+                                       ToolTip="{Binding Title}" />
 
                             <TextBlock Grid.Row="1"
-                                       MaxWidth="200"
-                                       HorizontalAlignment="Center"
+                                       Grid.ColumnSpan="2"
+                                       MaxWidth="300"
+                                       HorizontalAlignment="Stretch"
                                        VerticalAlignment="Center"
                                        Foreground="{DynamicResource Orc.Brushes.Control.Default.Foreground}"
                                        Text="{Binding Description}"
                                        TextWrapping="Wrap"
                                        Visibility="{Binding Description, Converter={catel:EmptyStringToCollapsingVisibilityConverter}}" />
 
                             <ContentPresenter Grid.Row="2"
+                                              Grid.ColumnSpan="2"
                                               Content="{Binding InnerContent}" />
                         </Grid>