WinGui: Fix log display in the GUI where the start of a log could be cut off. Fixes...

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index db1ca8f9d451be9f0b001b2de336412ea465c159..71be890df706ef48af06596061b6baf7d9995f2e 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -599,63 +599,78 @@
                              Loaded="ToolBarLoaded"\r
                              KeyboardNavigation.TabNavigation="Continue"\r
                              >\r
-                        <Button cal:Message.Attach="[Event Click] = [Action PresetAdd]" AutomationProperties.Name="Add Preset">\r
-                            <Button.Content>\r
-                                <StackPanel Orientation="Horizontal">\r
-                                    <Image Width="20"\r
+\r
+                        <ToolBar.Resources>\r
+                            <Style TargetType="{x:Type ToolBarPanel}">\r
+                                <Setter Property="Orientation" Value="Vertical"/>\r
+                                <Setter Property="VerticalAlignment" Value="Center"/>\r
+                            </Style>\r
+\r
+                            <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />\r
+                        </ToolBar.Resources>\r
+\r
+                        <ToolBarOverflowPanel>\r
+                            <Button cal:Message.Attach="[Event Click] = [Action PresetAdd]" AutomationProperties.Name="Add Preset">\r
+                                <Button.Content>\r
+                                    <StackPanel Orientation="Horizontal">\r
+                                        <Image Width="20"\r
                                            Height="20"\r
                                            Source="Images/add.png"\r
                                            />\r
-                                    <TextBlock Margin="2,0,0,0"\r
+                                        <TextBlock Margin="2,0,0,0"\r
                                                VerticalAlignment="Center"\r
                                                Style="{StaticResource textBlockOrangeStyle}"\r
                                                Text="{x:Static Properties:ResourcesUI.Generic_Add}"\r
                                                />\r
-                                </StackPanel>\r
-                            </Button.Content>\r
-                        </Button>\r
-                        <Button cal:Message.Attach="[Event Click] = [Action PresetRemove]" AutomationProperties.Name="Remove Preset">\r
-                            <Button.Content>\r
-                                <StackPanel Orientation="Horizontal">\r
-                                    <Image Width="20"\r
+                                    </StackPanel>\r
+                                </Button.Content>\r
+                            </Button>\r
+\r
+                            <Button Background="Transparent" cal:Message.Attach="[Event Click] = [Action PresetRemove]" AutomationProperties.Name="Remove Preset">\r
+                                <Button.Content>\r
+                                    <StackPanel Orientation="Horizontal">\r
+                                        <Image Width="20"\r
                                            Height="20"\r
                                            Source="Images/remove.png"\r
                                            SnapsToDevicePixels="True"\r
                                            />\r
-                                    <TextBlock Margin="2,0,0,0"\r
+                                        <TextBlock Margin="2,0,0,0"\r
                                                VerticalAlignment="Center"\r
                                                Style="{StaticResource textBlockOrangeStyle}"\r
                                                Text="{x:Static Properties:ResourcesUI.MainView_Remove}"\r
                                                />\r
-                                </StackPanel>\r
-                            </Button.Content>\r
-                        </Button>\r
-                        <Menu Background="Transparent" AutomationProperties.Name="Preset Options Dropdown">\r
-                            <MenuItem ToolBar.OverflowMode="Never">\r
-                                <MenuItem.Header>\r
-                                    <StackPanel Orientation="Horizontal">\r
-                                        <Image Width="20"\r
+                                    </StackPanel>\r
+                                </Button.Content>\r
+                            </Button>\r
+\r
+                            <Menu Background="Transparent" AutomationProperties.Name="Preset Options Dropdown" MinHeight="22">\r
+                                <MenuItem ToolBar.OverflowMode="Never">\r
+                                    <MenuItem.Header>\r
+                                        <StackPanel Orientation="Horizontal">\r
+                                            <Image Width="20"\r
                                                Height="20"\r
                                                Source="Images/Advanced.png"\r
                                                 RenderOptions.BitmapScalingMode="HighQuality"\r
                                                />\r
-                                        <TextBlock Margin="2,0,0,0"\r
+                                            <TextBlock Margin="2,0,0,0"\r
                                                    VerticalAlignment="Center"\r
                                                    Style="{StaticResource textBlockOrangeStyle}"\r
                                                    Text="{x:Static Properties:ResourcesUI.MainView_Options}"\r
                                                    />\r
-                                    </StackPanel>\r
-                                </MenuItem.Header>\r
-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
-                                <Separator />\r
-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />\r
-                                <Separator />\r
-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />\r
-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />\r
-                                <Separator />\r
-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />\r
-                            </MenuItem>\r
-                        </Menu>\r
+                                        </StackPanel>\r
+                                    </MenuItem.Header>\r
+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
+                                    <Separator />\r
+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />\r
+                                    <Separator />\r
+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />\r
+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />\r
+                                    <Separator />\r
+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />\r
+                                </MenuItem>\r
+                            </Menu>\r
+                        </ToolBarOverflowPanel>\r
+\r
                     </ToolBar>\r
                 </Grid>\r
             </GroupBox>\r
@@ -705,10 +720,10 @@
                 <TextBlock Text="{Binding Path=ProgramStatusLabel}" TextTrimming="CharacterEllipsis" />\r
             </StatusBarItem>\r
             <StatusBarItem HorizontalAlignment="Right" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_WhenDone}">\r
-                <Menu Background="Transparent">\r
+                <Menu Background="Transparent" >\r
                     <MenuItem>\r
                         <MenuItem.Header>\r
-                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal">\r
+                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal" MinHeight="26">\r
                                 <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_WhenDone}" />\r
                                 <TextBlock Margin="8,0,0,0" VerticalAlignment="Center" Text="{Binding QueueViewModel.WhenDoneAction}" />\r
                                 <Path Height="5"\r

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 4a35cb02daa5fd7ec08bc31fb98d662a252c9de5..c1c00bb39e2854b97d4d63d784c6988b916ae399 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -61,7 +61,6 @@
                 </Style>\r
 \r
                 <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />\r
-                <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />\r
             </ToolBar.Resources>\r
 \r
             <DockPanel Background="Transparent" HorizontalAlignment="Stretch">\r
@@ -97,7 +96,7 @@
                 </Button>\r
 \r
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Right">\r
-                    <Menu HorizontalAlignment="Right" Background="Transparent">\r
+                    <Menu HorizontalAlignment="Right" VerticalAlignment="Center" Background="Transparent">\r
                         <MenuItem>\r
                             <MenuItem.Header>\r
                                 <StackPanel Height="32" Orientation="Horizontal">\r
@@ -152,7 +151,7 @@
                         </MenuItem>\r
                     </Menu>\r
 \r
-                    <Menu HorizontalAlignment="Right" Background="Transparent">\r
+                    <Menu HorizontalAlignment="Right" Background="Transparent" VerticalAlignment="Center">\r
                         <MenuItem>\r
                             <MenuItem.Header>\r
                                 <StackPanel Height="32" Orientation="Horizontal">\r
@@ -177,7 +176,6 @@
 \r
                 </StackPanel>\r
 \r
-\r
             </DockPanel>\r
         </ToolBar>\r
 \r